diff options
6 files changed, 16 insertions, 6 deletions
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp index b942c021bc05..641de3c93ca8 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp @@ -16,7 +16,9 @@ // clang-format off -#include <cstdlib> +#if __has_include(<cstdlib>) +# include <cstdlib> +#endif #include "test_macros.h" #if TEST_STD_VER < 14 diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp index 493294f8d875..31ed16e4504a 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp @@ -16,7 +16,9 @@ // clang-format off -#include <cstring> +#if __has_include(<cstring>) +# include <cstring> +#endif #include "test_macros.h" #if TEST_STD_VER < 14 diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp index 2b5fed76d679..3e7410133468 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp @@ -16,7 +16,9 @@ // clang-format off -#include <execution> +#if __has_include(<execution>) +# include <execution> +#endif #include "test_macros.h" #if TEST_STD_VER < 14 diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp index 589c8529b52d..e118bf56b5e2 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp @@ -16,7 +16,9 @@ // clang-format off -#include <flat_set> +#if __has_include(<flat_set>) +# include <flat_set> +#endif #include "test_macros.h" #if TEST_STD_VER < 14 diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/random.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/random.version.compile.pass.cpp index ad6ac90a6d28..70086434d6a6 100644 --- a/libcxx/test/std/language.support/support.limits/support.limits.general/random.version.compile.pass.cpp +++ b/libcxx/test/std/language.support/support.limits/support.limits.general/random.version.compile.pass.cpp @@ -16,7 +16,9 @@ // clang-format off -#include <random> +#if __has_include(<random>) +# include <random> +#endif #include "test_macros.h" #if TEST_STD_VER < 14 diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py index 6dbb47a4633c..579fd87783ab 100755 --- a/libcxx/utils/generate_feature_test_macro_components.py +++ b/libcxx/utils/generate_feature_test_macro_components.py @@ -2662,7 +2662,7 @@ def main(): ftm = FeatureTestMacros( os.path.join(source_root, "utils", "data", "feature_test_macro", "data.json") ) - ftm.generate_header_test_directory(os.path.join(macro_test_path, "v2")) + ftm.generate_header_test_directory(macro_test_path) # Example how to use the generator v2 to generate the output. if False: |