From 946780474f3b04568184183d2db28e0480212eb2 Mon Sep 17 00:00:00 2001 From: Paul Osmialowski Date: Mon, 3 Mar 2025 18:10:36 +0000 Subject: [PATCH] [libc++][test] extend XFAIL clauses to cover Amazon Linux too (#129377) The default triple of Amazon Linux on AArch64 is aarch64-amazon-linux, see issue highlighded by PR #109263, somewhat serious linker issues are encountered if any other triple is being used. Unfortunately, this makes XFAIL lines like `XFAIL: target=aarch64{{.*}}-linux-gnu` ineffective, making it impossible to complete all of the check-cxx on Amazon Linux without failing. (cherry picked from commit 8f4ee42d59976a9343d7576ef9a1fe2cf482a057) --- .../iostream.format/std.manip/setfill_wchar_max.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp | 1 + libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp | 1 + libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp | 1 + 10 files changed, 10 insertions(+) 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 9d4126153cc23..b24c0b90d86f1 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 @@ -17,6 +17,7 @@ // XFAIL: target={{.*}}-windows{{.*}} && libcpp-abi-version=1 // XFAIL: target=armv{{7|8}}{{l?}}{{.*}}-linux-gnueabihf && libcpp-abi-version=1 // XFAIL: target=aarch64{{.*}}-linux-gnu && libcpp-abi-version=1 +// XFAIL: target=aarch64{{.*}}-amazon-linux && libcpp-abi-version=1 #include #include 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 57b8c13aa3c14..151c9160b0fee 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 @@ -19,6 +19,7 @@ // TODO: investigation needed // TODO(netbsd): incomplete support for locales // XFAIL: target={{.*}}-linux-gnu{{.*}}, netbsd, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} // REQUIRES: locale.cs_CZ.ISO8859-2 #include 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 430d35fe739e5..463d0fd3bd1eb 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 b512fa9b5fcf8..b83bfabfb96be 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 472dc19680263..24c38e9f631c9 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 9125df404b1de..3a0229ec3be2f 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 f85b6a40ce129..eba6b3383059a 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 aa9441cb3e58f..175a05a9ef7c4 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 9746e45f29da5..e7dbccd6f0ba4 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 @@ -23,6 +23,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include 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 178979d5b9ce8..803d062693c33 100644 --- a/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp +++ b/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp @@ -24,6 +24,7 @@ // TODO: investigation needed // XFAIL: target={{.*}}-linux-gnu{{.*}} +// XFAIL: target={{.*}}-amazon-linux{{.*}} #include #include