[libcxx-commits] [libcxx] [libcxx] Marks transform_error.mandates.verify.cpp unsupported on msvc (PR #104635)

via libcxx-commits libcxx-commits at lists.llvm.org
Fri Aug 16 12:38:29 PDT 2024


https://github.com/zeroomega updated https://github.com/llvm/llvm-project/pull/104635

>From 8260fbba152e137c419833f9a3f140140976b759 Mon Sep 17 00:00:00 2001
From: Haowei Wu <haowei at google.com>
Date: Fri, 16 Aug 2024 11:59:57 -0700
Subject: [PATCH 1/2] [libcxx] Marks transform_error.mandates.verify.cpp
 unsupported on msvc

PR #102851 marks reference types in union as error on msvc by changing
the clang, which makes 'transform_error.mandates.verify.cpp' no longer
failing on msvc from ToT. However, all libcxx buildbots do not build
clang from source, therefore, this test will still fail on these
bots, which is incorrect. This patch marks this test as unsupportted
on msvc so both bots using ToT clang and release version clang can be
green.
---
 .../transform_error.mandates.verify.cpp                  | 9 +++++----
 .../expected.void/transform_error.mandates.verify.cpp    | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp
index 5bf094bf37709d..30329f679b0c7c 100644
--- a/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp
+++ b/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp
@@ -10,11 +10,12 @@
 // minimum required version these obsolete tests can be removed.
 // TODO(LLVM-20) remove spurious clang diagnostic tests.
 
-// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
-
 // With clang-cl, some warnings have a 'which is a Microsoft extension' suffix
-// which break the tests.
-// XFAIL: msvc
+// which break the tests. But #102851 will turn it into an error, making the test pass.
+// However, upstream libcxx buildbots do not build clang from source while testing, so
+// this tests still expected to fail on these bots. Mark msvc as unsupported to mitigate
+// this issue.
+// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, msvc
 
 // Test the mandates
 
diff --git a/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp
index 508b01a7bcea39..7fd9a73701b285 100644
--- a/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp
+++ b/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp
@@ -10,11 +10,12 @@
 // minumum required version these obsolete tests can be removed.
 // TODO(LLVM-20) remove spurious clang diagnostic tests.
 
-// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
-
 // With clang-cl, some warnings have a 'which is a Microsoft extension' suffix
-// which break the tests.
-// XFAIL: msvc
+// which break the tests. But #102851 will turn it into an error, making the test pass.
+// However, upstream libcxx buildbots do not build clang from source while testing, so
+// this tests still expected to fail on these bots. Mark msvc as unsupported to mitigate
+// this issue.
+// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, msvc
 
 // Test the mandates
 

>From 21fea6ae0eefa55e5af27fb48daf2eea834c719e Mon Sep 17 00:00:00 2001
From: Haowei Wu <haowei at google.com>
Date: Fri, 16 Aug 2024 12:38:01 -0700
Subject: [PATCH 2/2] amend! [libcxx] Marks transform_error.mandates.verify.cpp
 unsupported on msvc

Address review comments.

[libcxx] Marks transform_error.mandates.verify.cpp unsupported on msvc

PR #102851 marks reference types in union as error on msvc by changing
the clang, which makes 'transform_error.mandates.verify.cpp' no longer
failing on msvc from ToT. However, all libcxx buildbots do not build
clang from source, therefore, this test will still fail on these
bots, which is incorrect. This patch marks this test as unsupportted
on msvc so both bots using ToT clang and release version clang can be
green.
---
 .../expected.expected/transform_error.mandates.verify.cpp     | 4 +++-
 .../expected.void/transform_error.mandates.verify.cpp         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp
index 30329f679b0c7c..31d6d9a2413e81 100644
--- a/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp
+++ b/libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp
@@ -10,12 +10,14 @@
 // minimum required version these obsolete tests can be removed.
 // TODO(LLVM-20) remove spurious clang diagnostic tests.
 
+// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
+
 // With clang-cl, some warnings have a 'which is a Microsoft extension' suffix
 // which break the tests. But #102851 will turn it into an error, making the test pass.
 // However, upstream libcxx buildbots do not build clang from source while testing, so
 // this tests still expected to fail on these bots. Mark msvc as unsupported to mitigate
 // this issue.
-// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, msvc
+// UNSUPPORTED: msvc
 
 // Test the mandates
 
diff --git a/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp
index 7fd9a73701b285..b15fd9e627cc46 100644
--- a/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp
+++ b/libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp
@@ -10,12 +10,14 @@
 // minumum required version these obsolete tests can be removed.
 // TODO(LLVM-20) remove spurious clang diagnostic tests.
 
+// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
+
 // With clang-cl, some warnings have a 'which is a Microsoft extension' suffix
 // which break the tests. But #102851 will turn it into an error, making the test pass.
 // However, upstream libcxx buildbots do not build clang from source while testing, so
 // this tests still expected to fail on these bots. Mark msvc as unsupported to mitigate
 // this issue.
-// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, msvc
+// UNSUPPORTED: msvc
 
 // Test the mandates
 



More information about the libcxx-commits mailing list