aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark de Wever <koraq@xs4all.nl>2025-04-06 15:59:35 +0200
committerMark de Wever <koraq@xs4all.nl>2025-04-06 20:10:32 +0200
commitee96014023174d0f3bb10ed60682ae5ce591577e (patch)
tree6d02da23da121ef07fd6f77606106f8efb0b9148
parent4ef5a855816655466e0db714516060a7176ae5a7 (diff)
downloadllvm-users/mordante/ftm/do_not_commit.zip
llvm-users/mordante/ftm/do_not_commit.tar.gz
llvm-users/mordante/ftm/do_not_commit.tar.bz2
[libc++] DO NOT COMMIT diff FTM test headers v1 vs v2.users/mordante/ftm/do_not_commit
-rw-r--r--libcxx/test/std/language.support/support.limits/support.limits.general/cstdlib.version.compile.pass.cpp4
-rw-r--r--libcxx/test/std/language.support/support.limits/support.limits.general/cstring.version.compile.pass.cpp4
-rw-r--r--libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.compile.pass.cpp4
-rw-r--r--libcxx/test/std/language.support/support.limits/support.limits.general/flat_set.version.compile.pass.cpp4
-rw-r--r--libcxx/test/std/language.support/support.limits/support.limits.general/random.version.compile.pass.cpp4
-rwxr-xr-xlibcxx/utils/generate_feature_test_macro_components.py2
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 b942c02..641de3c 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 493294f..31ed16e 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 2b5fed7..3e74101 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 589c852..e118bf5 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 ad6ac90..7008643 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 6dbb47a..579fd87 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: