Skip to content

Revert "[libc++][test] extend -linux-gnu XFAIL to cover all of the -linux targets (#129140)" #129271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2025

Conversation

pawosm-arm
Copy link
Contributor

The effect of this commit is too broad and may affect also those variants of Linux systems on which the affected test cases are known to pass.

An alternative version of this commit will be prepared afresh.

This reverts commit c93dc58.

…inux targets (llvm#129140)"

The effect of this commit is too broad and may affect also those
variants of Linux systems on which the affected test cases are known
to pass.

An alternative version of this commit will be prepared afresh.

This reverts commit c93dc58.
@pawosm-arm pawosm-arm requested a review from a team as a code owner February 28, 2025 17:13
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Feb 28, 2025
@llvmbot
Copy link
Member

llvmbot commented Feb 28, 2025

@llvm/pr-subscribers-libcxx

Author: Paul Osmialowski (pawosm-arm)

Changes

The effect of this commit is too broad and may affect also those variants of Linux systems on which the affected test cases are known to pass.

An alternative version of this commit will be prepared afresh.

This reverts commit c93dc58.


Full diff: https://github.com/llvm/llvm-project/pull/129271.diff

10 Files Affected:

  • (modified) libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp (+1-1)
  • (modified) libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp (+1-1)
diff --git a/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp b/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp
index 82842a75827ac..9d4126153cc23 100644
--- a/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp
@@ -16,7 +16,7 @@
 
 // XFAIL: target={{.*}}-windows{{.*}} && libcpp-abi-version=1
 // XFAIL: target=armv{{7|8}}{{l?}}{{.*}}-linux-gnueabihf && libcpp-abi-version=1
-// XFAIL: target=aarch64{{.*}}-linux{{.*}} && libcpp-abi-version=1
+// XFAIL: target=aarch64{{.*}}-linux-gnu && libcpp-abi-version=1
 
 #include <iomanip>
 #include <ostream>
diff --git a/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp
index 879597b2f80fd..57b8c13aa3c14 100644
--- a/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp
@@ -18,7 +18,7 @@
 
 // TODO: investigation needed
 // TODO(netbsd): incomplete support for locales
-// XFAIL: target={{.*}}-linux{{.*}}, netbsd, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, netbsd, freebsd
 // REQUIRES: locale.cs_CZ.ISO8859-2
 
 #include <regex>
diff --git a/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp
index 59fb1c48e15d3..430d35fe739e5 100644
--- a/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp
index 0a966759eac3b..b512fa9b5fcf8 100644
--- a/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp
index 87ff1e5b6ef12..472dc19680263 100644
--- a/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp
index c4b211e613bec..9125df404b1de 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp
index 56cf2e6a61ff3..f85b6a40ce129 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp
index 4655a5c2e0ee6..aa9441cb3e58f 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp
index 7bc8a537ca228..9746e45f29da5 100644
--- a/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp
@@ -22,7 +22,7 @@
 //                  regex_constants::match_flag_type flags = regex_constants::match_default);
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}, freebsd
+// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp b/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp
index 3cbbaef9c81b5..178979d5b9ce8 100644
--- a/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp
+++ b/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp
@@ -23,7 +23,7 @@
 //   lookup_collatename(ForwardIterator first, ForwardIterator last) const;
 
 // TODO: investigation needed
-// XFAIL: target={{.*}}-linux{{.*}}
+// XFAIL: target={{.*}}-linux-gnu{{.*}}
 
 #include <regex>
 #include <iterator>

Copy link
Member

@ldionne ldionne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test changes often have subtle implications and need to be looked at carefully. XFAIL and UNSUPPORTED is basically how we control what test coverage we have for the library, so it's actually very important to get right, lest it's possible to turn off coverage for whole parts of the library without intending to do so.

Thanks for reverting, please open a PR when you're ready to re-land and we can go over it to make sure it does what you intend it to do. It's also possible that we'll suggest a different approach since it seems you're trying to get coverage for a different flavour of Linux.

@ldionne ldionne merged commit c363975 into llvm:main Feb 28, 2025
75 of 80 checks passed
jph-13 pushed a commit to jph-13/llvm-project that referenced this pull request Mar 21, 2025
…inux targets (llvm#129140)" (llvm#129271)

The effect of this commit is too broad and may affect also those
variants of Linux systems on which the affected test cases are known to
pass.

An alternative version of this commit will be prepared afresh.

This reverts commit c93dc58.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants