aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Wójt <dominik.wojt@arm.com>2024-01-18 18:40:52 +0100
committerGitHub <noreply@github.com>2024-01-18 18:40:52 +0100
commit7f0515323670459b8376b866bc73a448f0a5aa6e (patch)
treea33a52f4344f99d48d1fe7cf17238419b176fabe
parent30da0f5a359ab4a684c5fdf0f4dbed20bae10f99 (diff)
downloadllvm-7f0515323670459b8376b866bc73a448f0a5aa6e.zip
llvm-7f0515323670459b8376b866bc73a448f0a5aa6e.tar.gz
llvm-7f0515323670459b8376b866bc73a448f0a5aa6e.tar.bz2
[libc++] Un-xfail module tests in picolibc tests (#78580)
Some of the module tests now pass after picolibc update. https://github.com/llvm/llvm-project/pull/77908 The remaining tests fail and are now set to xfail on picolibc specifically.
-rw-r--r--libcxx/test/libcxx/selftest/modules/std-and-std.compat-module.sh.cpp4
-rw-r--r--libcxx/test/libcxx/selftest/modules/std.compat-module.sh.cpp4
-rw-r--r--libcxx/test/std/modules/std.compat.pass.cpp4
-rw-r--r--libcxx/utils/libcxx/test/features.py1
4 files changed, 12 insertions, 1 deletions
diff --git a/libcxx/test/libcxx/selftest/modules/std-and-std.compat-module.sh.cpp b/libcxx/test/libcxx/selftest/modules/std-and-std.compat-module.sh.cpp
index d56ebb2..81241d7 100644
--- a/libcxx/test/libcxx/selftest/modules/std-and-std.compat-module.sh.cpp
+++ b/libcxx/test/libcxx/selftest/modules/std-and-std.compat-module.sh.cpp
@@ -12,6 +12,10 @@
// XFAIL: has-no-cxx-module-support
+// picolibc does not provide the required timespec_get function, and the
+// "using-if-exists" mechanism apparently did not work here.
+// XFAIL: LIBCXX-PICOLIBC-FIXME
+
// Make sure that the compile flags contain the expected elements.
// The tests only look for the expected components and not the exact flags.
// Otherwise changing the location of the module would break this test.
diff --git a/libcxx/test/libcxx/selftest/modules/std.compat-module.sh.cpp b/libcxx/test/libcxx/selftest/modules/std.compat-module.sh.cpp
index e847098..b74c2f1 100644
--- a/libcxx/test/libcxx/selftest/modules/std.compat-module.sh.cpp
+++ b/libcxx/test/libcxx/selftest/modules/std.compat-module.sh.cpp
@@ -12,6 +12,10 @@
// XFAIL: has-no-cxx-module-support
+// picolibc does not provide the required timespec_get function, and the
+// "using-if-exists" mechanism apparently did not work here.
+// XFAIL: LIBCXX-PICOLIBC-FIXME
+
// Make sure that the compile flags contain the expected elements.
// The tests only look for the expected components and not the exact flags.
// Otherwise changing the location of the module would break this test.
diff --git a/libcxx/test/std/modules/std.compat.pass.cpp b/libcxx/test/std/modules/std.compat.pass.cpp
index e840f3c..40ea979 100644
--- a/libcxx/test/std/modules/std.compat.pass.cpp
+++ b/libcxx/test/std/modules/std.compat.pass.cpp
@@ -12,6 +12,10 @@
// XFAIL: has-no-cxx-module-support
+// picolibc does not provide the required timespec_get function, and the
+// "using-if-exists" mechanism apparently did not work here.
+// XFAIL: LIBCXX-PICOLIBC-FIXME
+
// A minimal test to validate import works.
// MODULE_DEPENDENCIES: std.compat
diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py
index 8c27d8c..1983bc9 100644
--- a/libcxx/utils/libcxx/test/features.py
+++ b/libcxx/utils/libcxx/test/features.py
@@ -324,7 +324,6 @@ DEFAULT_FEATURES = [
# This is not allowed per C11 7.1.2 Standard headers/6
# Any declaration of a library function shall have external linkage.
when=lambda cfg: "__ANDROID__" in compilerMacros(cfg)
- or "__PICOLIBC__" in compilerMacros(cfg)
or platform.system().lower().startswith("aix")
# Avoid building on platforms that don't support modules properly.
or not hasCompileFlag(cfg, "-Wno-reserved-module-identifier"),