[PATCH] D53466: [libcxx] [test] Don't detect Windows' UCRT with TEST_COMPILER_C1XX

[Billy Robert O'Neal III via Phabricator via cfe-commits]

BillyONeal updated this revision to Diff 170294.
BillyONeal added a comment.

Also fixed cstdlib tests.


https://reviews.llvm.org/D53466

Files:
  test/std/depr/depr.c.headers/stdlib_h.pass.cpp
  test/std/language.support/support.runtime/cstdlib.pass.cpp


Index: test/std/language.support/support.runtime/cstdlib.pass.cpp
===================================================================
--- test/std/language.support/support.runtime/cstdlib.pass.cpp
+++ test/std/language.support/support.runtime/cstdlib.pass.cpp
@@ -75,10 +75,8 @@
     static_assert((std::is_same<decltype(std::srand(0)), void>::value), "");
 
 //  Microsoft does not implement aligned_alloc in their C library
-#ifndef TEST_COMPILER_C1XX
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
-    static_assert((std::is_same<decltype(std::aligned_alloc(0,0)), 
void*>::value), "");
-#endif
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32)
+    static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), 
"");
 #endif
 
     static_assert((std::is_same<decltype(std::calloc(0,0)), void*>::value), 
"");
Index: test/std/depr/depr.c.headers/stdlib_h.pass.cpp
===================================================================
--- test/std/depr/depr.c.headers/stdlib_h.pass.cpp
+++ test/std/depr/depr.c.headers/stdlib_h.pass.cpp
@@ -87,10 +87,8 @@
     static_assert((std::is_same<decltype(srand(0)), void>::value), "");
 
 //  Microsoft does not implement aligned_alloc in their C library
-#ifndef TEST_COMPILER_C1XX
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32)
     static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), 
"");
-#endif
 #endif
 
     static_assert((std::is_same<decltype(calloc(0,0)), void*>::value), "");



Index: test/std/language.support/support.runtime/cstdlib.pass.cpp
===================================================================
--- test/std/language.support/support.runtime/cstdlib.pass.cpp
+++ test/std/language.support/support.runtime/cstdlib.pass.cpp
@@ -75,10 +75,8 @@
     static_assert((std::is_same<decltype(std::srand(0)), void>::value), "");
 
 //  Microsoft does not implement aligned_alloc in their C library
-#ifndef TEST_COMPILER_C1XX
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
-    static_assert((std::is_same<decltype(std::aligned_alloc(0,0)), void*>::value), "");
-#endif
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32)
+    static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), "");
 #endif
 
     static_assert((std::is_same<decltype(std::calloc(0,0)), void*>::value), "");
Index: test/std/depr/depr.c.headers/stdlib_h.pass.cpp
===================================================================
--- test/std/depr/depr.c.headers/stdlib_h.pass.cpp
+++ test/std/depr/depr.c.headers/stdlib_h.pass.cpp
@@ -87,10 +87,8 @@
     static_assert((std::is_same<decltype(srand(0)), void>::value), "");
 
 //  Microsoft does not implement aligned_alloc in their C library
-#ifndef TEST_COMPILER_C1XX
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && !defined(_WIN32)
     static_assert((std::is_same<decltype(aligned_alloc(0,0)), void*>::value), "");
-#endif
 #endif
 
     static_assert((std::is_same<decltype(calloc(0,0)), void*>::value), "");

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits