[libc++] Fix broken modules tests on single-threaded systems

Since c0cd106fcc9f, we add __config_site macro defines to the compiler
command line whether we are building with modules or not. This means
that the modules tests are expected to fail on single-threaded systems
whether we build with modules or not.

diff --git a/libcxx/test/libcxx/modules/cinttypes_exports.compile.pass.cpp b/libcxx/test/libcxx/modules/cinttypes_exports.compile.pass.cpp
index 8037ba3..57a5ba5 100644 (file)
--- a/libcxx/test/libcxx/modules/cinttypes_exports.compile.pass.cpp
+++ b/libcxx/test/libcxx/modules/cinttypes_exports.compile.pass.cpp
@@ -12,10 +12,7 @@
 
 // FIXME: The <atomic> header is not supported for single-threaded systems,
 // but still gets built as part of the 'std' module, which breaks the build.
-// The failure only shows up when modules are enabled AND we're building
-// without threads, which is when the __config_site macro for _LIBCPP_HAS_NO_THREADS
-// is honored.
-// XFAIL: libcpp-has-no-threads && -fmodules
+// XFAIL: libcpp-has-no-threads
 
 // REQUIRES: modules-support
 // ADDITIONAL_COMPILE_FLAGS: -fmodules

diff --git a/libcxx/test/libcxx/modules/clocale_exports.compile.pass.cpp b/libcxx/test/libcxx/modules/clocale_exports.compile.pass.cpp
index f349985..3b87b7b 100644 (file)
--- a/libcxx/test/libcxx/modules/clocale_exports.compile.pass.cpp
+++ b/libcxx/test/libcxx/modules/clocale_exports.compile.pass.cpp
@@ -12,10 +12,7 @@
 
 // FIXME: The <atomic> header is not supported for single-threaded systems,
 // but still gets built as part of the 'std' module, which breaks the build.
-// The failure only shows up when modules are enabled AND we're building
-// without threads, which is when the __config_site macro for _LIBCPP_HAS_NO_THREADS
-// is honored.
-// XFAIL: libcpp-has-no-threads && -fmodules
+// XFAIL: libcpp-has-no-threads
 
 // UNSUPPORTED: c++98, c++03
 

diff --git a/libcxx/test/libcxx/modules/cstdint_exports.compile.pass.cpp b/libcxx/test/libcxx/modules/cstdint_exports.compile.pass.cpp
index 783670e..0887b59 100644 (file)
--- a/libcxx/test/libcxx/modules/cstdint_exports.compile.pass.cpp
+++ b/libcxx/test/libcxx/modules/cstdint_exports.compile.pass.cpp
@@ -12,10 +12,7 @@
 
 // FIXME: The <atomic> header is not supported for single-threaded systems,
 // but still gets built as part of the 'std' module, which breaks the build.
-// The failure only shows up when modules are enabled AND we're building
-// without threads, which is when the __config_site macro for _LIBCPP_HAS_NO_THREADS
-// is honored.
-// XFAIL: libcpp-has-no-threads && -fmodules
+// XFAIL: libcpp-has-no-threads
 
 // Test that <cstdint> re-exports <stdint.h>
 

diff --git a/libcxx/test/libcxx/modules/inttypes_h_exports.compile.pass.cpp b/libcxx/test/libcxx/modules/inttypes_h_exports.compile.pass.cpp
index f4000a2..0add4e1 100644 (file)
--- a/libcxx/test/libcxx/modules/inttypes_h_exports.compile.pass.cpp
+++ b/libcxx/test/libcxx/modules/inttypes_h_exports.compile.pass.cpp
@@ -12,10 +12,7 @@
 
 // FIXME: The <atomic> header is not supported for single-threaded systems,
 // but still gets built as part of the 'std' module, which breaks the build.
-// The failure only shows up when modules are enabled AND we're building
-// without threads, which is when the __config_site macro for _LIBCPP_HAS_NO_THREADS
-// is honored.
-// XFAIL: libcpp-has-no-threads && -fmodules
+// XFAIL: libcpp-has-no-threads
 
 // Test that intypes.h re-exports stdint.h
 

diff --git a/libcxx/test/libcxx/modules/stdint_h_exports.compile.pass.cpp b/libcxx/test/libcxx/modules/stdint_h_exports.compile.pass.cpp
index 2f0f4c4..b83e99b 100644 (file)
--- a/libcxx/test/libcxx/modules/stdint_h_exports.compile.pass.cpp
+++ b/libcxx/test/libcxx/modules/stdint_h_exports.compile.pass.cpp
@@ -8,10 +8,7 @@
 
 // FIXME: The <atomic> header is not supported for single-threaded systems,
 // but still gets built as part of the 'std' module, which breaks the build.
-// The failure only shows up when modules are enabled AND we're building
-// without threads, which is when the __config_site macro for _LIBCPP_HAS_NO_THREADS
-// is honored.
-// XFAIL: libcpp-has-no-threads && -fmodules
+// XFAIL: libcpp-has-no-threads
 
 // Test that int8_t and the like are exported from stdint.h, not inttypes.h
 

diff --git a/libcxx/test/libcxx/modules/stds_include.sh.cpp b/libcxx/test/libcxx/modules/stds_include.sh.cpp
index d7c4eab..c46ab6f 100644 (file)
--- a/libcxx/test/libcxx/modules/stds_include.sh.cpp
+++ b/libcxx/test/libcxx/modules/stds_include.sh.cpp
@@ -17,10 +17,7 @@
 
 // FIXME: The <atomic> header is not supported for single-threaded systems,
 // but still gets built as part of the 'std' module, which breaks the build.
-// The failure only shows up when modules are enabled AND we're building
-// without threads, which is when the __config_site macro for _LIBCPP_HAS_NO_THREADS
-// is honored.
-// XFAIL: libcpp-has-no-threads && -fmodules
+// XFAIL: libcpp-has-no-threads
 
 // REQUIRES: modules-support