[libcxx] r339990 - Merging r339742:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Fri Aug 17 00:20:52 2018
New Revision: 339990

URL: http://llvm.org/viewvc/llvm-project?rev=339990&view=rev
Log:
Merging r339742:
------------------------------------------------------------------------
r339742 | ldionne | 2018-08-15 02:18:01 +0200 (Wed, 15 Aug 2018) | 11 lines

[libc++] Disable failing C11 feature tests for <cfloat> and <float.h>

Summary:
Those tests are breaking the test bots. A Bugzilla has been filed to
make sure those tests are re-enabled: https://bugs.llvm.org/show_bug.cgi?id=38572

Reviewers: mclow.lists, EricWF

Subscribers: krytarowski, christof, dexonsmith, cfe-commits

Differential Revision: https://reviews.llvm.org/D50748
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_70/   (props changed)
    libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp
    libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp

Propchange: libcxx/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 17 00:20:52 2018
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:339431,339675,339697,339702,339741,339743,339794,339874
+/libcxx/trunk:339431,339675,339697,339702,339741-339743,339794,339874

Modified: libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp?rev=339990&r1=339989&r2=339990&view=diff
==============================================================================
--- libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp (original)
+++ libcxx/branches/release_70/test/std/depr/depr.c.headers/float_h.pass.cpp Fri Aug 17 00:20:52 2018
@@ -25,7 +25,7 @@
 #error FLT_RADIX not defined
 #endif
 
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && 0
 #ifndef FLT_HAS_SUBNORM
 #error FLT_HAS_SUBNORM not defined
 #endif
@@ -55,7 +55,7 @@
 #error DECIMAL_DIG not defined
 #endif
 
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && 0
 #ifndef FLT_DECIMAL_DIG
 #error FLT_DECIMAL_DIG not defined
 #endif
@@ -165,7 +165,7 @@
 #error LDBL_MIN not defined
 #endif
 
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && 0
 #ifndef FLT_TRUE_MIN
 #error FLT_TRUE_MIN not defined
 #endif

Modified: libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp?rev=339990&r1=339989&r2=339990&view=diff
==============================================================================
--- libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp (original)
+++ libcxx/branches/release_70/test/std/language.support/support.limits/c.limits/cfloat.pass.cpp Fri Aug 17 00:20:52 2018
@@ -25,7 +25,7 @@
 #error FLT_RADIX not defined
 #endif
 
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && 0
 #ifndef FLT_HAS_SUBNORM
 #error FLT_HAS_SUBNORM not defined
 #endif
@@ -55,7 +55,7 @@
 #error DECIMAL_DIG not defined
 #endif
 
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && 0
 #ifndef FLT_DECIMAL_DIG
 #error FLT_DECIMAL_DIG not defined
 #endif
@@ -165,7 +165,7 @@
 #error LDBL_MIN not defined
 #endif
 
-#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES)
+#if TEST_STD_VER > 14 && defined(TEST_HAS_C11_FEATURES) && 0
 #ifndef FLT_TRUE_MIN
 #error FLT_TRUE_MIN not defined
 #endif