[clang] f2c0c72 - [Windows] Convert clang/test/Modules tests to check 'target=<triple>'

Paul Robinson via cfe-commits cfe-commits at lists.llvm.org
Tue Nov 29 12:17:45 PST 2022


Author: Paul Robinson
Date: 2022-11-29T12:17:36-08:00
New Revision: f2c0c7299b18448ac3ae04891b53fd8cac4af178

URL: https://github.com/llvm/llvm-project/commit/f2c0c7299b18448ac3ae04891b53fd8cac4af178
DIFF: https://github.com/llvm/llvm-project/commit/f2c0c7299b18448ac3ae04891b53fd8cac4af178.diff

LOG: [Windows] Convert clang/test/Modules tests to check 'target=<triple>'

Part of the project to eliminate special handling for triples in lit
expressions.

Added: 
    

Modified: 
    clang/test/Modules/crash-vfs-path-emptydir-entries.m
    clang/test/Modules/crash-vfs-path-symlink-component.m
    clang/test/Modules/crash-vfs-path-symlink-topheader.m
    clang/test/Modules/crash-vfs-path-traversal.m
    clang/test/Modules/crash-vfs-relative-overlay.m
    clang/test/Modules/crash-vfs-umbrella-frameworks.m
    clang/test/SemaTemplate/instantiation-depth-default.cpp

Removed: 
    


################################################################################
diff  --git a/clang/test/Modules/crash-vfs-path-emptydir-entries.m b/clang/test/Modules/crash-vfs-path-emptydir-entries.m
index a5b22d7c2be9..a7ee1fe176fb 100644
--- a/clang/test/Modules/crash-vfs-path-emptydir-entries.m
+++ b/clang/test/Modules/crash-vfs-path-emptydir-entries.m
@@ -1,7 +1,7 @@
 // REQUIRES: crash-recovery, shell
 
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// XFAIL: target={{.*-windows-gnu}}
 
 // Test clang can collect symbolic link headers used in modules.
 // crash reproducer if there's a symbolic link header file used in a module.

diff  --git a/clang/test/Modules/crash-vfs-path-symlink-component.m b/clang/test/Modules/crash-vfs-path-symlink-component.m
index e8b5848abfdd..8280cd79bbc2 100644
--- a/clang/test/Modules/crash-vfs-path-symlink-component.m
+++ b/clang/test/Modules/crash-vfs-path-symlink-component.m
@@ -1,7 +1,7 @@
 // REQUIRES: crash-recovery, shell
 
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// XFAIL: target={{.*-windows-gnu}}
 
 // Test that clang is capable of collecting the right header files in the
 // crash reproducer if there's a symbolic link component in the path.

diff  --git a/clang/test/Modules/crash-vfs-path-symlink-topheader.m b/clang/test/Modules/crash-vfs-path-symlink-topheader.m
index beea957a7784..5c2d502b209d 100644
--- a/clang/test/Modules/crash-vfs-path-symlink-topheader.m
+++ b/clang/test/Modules/crash-vfs-path-symlink-topheader.m
@@ -1,7 +1,7 @@
 // REQUIRES: crash-recovery, shell
 
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// XFAIL: target={{.*-windows-gnu}}
 
 // Test clang can collect symbolic link headers used in modules.
 // crash reproducer if there's a symbolic link header file used in a module.

diff  --git a/clang/test/Modules/crash-vfs-path-traversal.m b/clang/test/Modules/crash-vfs-path-traversal.m
index 198e1fc68cad..7705b7930e9c 100644
--- a/clang/test/Modules/crash-vfs-path-traversal.m
+++ b/clang/test/Modules/crash-vfs-path-traversal.m
@@ -4,7 +4,7 @@
 // FIXME: Canonicalizing paths to remove relative traversal components
 // currenty fails a unittest on windows and is disable by default.
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// XFAIL: target={{.*-windows-gnu}}
 
 // RUN: rm -rf %t
 // RUN: mkdir -p %t/i %t/m %t

diff  --git a/clang/test/Modules/crash-vfs-relative-overlay.m b/clang/test/Modules/crash-vfs-relative-overlay.m
index 59cd8fd9c70d..ce2902417943 100644
--- a/clang/test/Modules/crash-vfs-relative-overlay.m
+++ b/clang/test/Modules/crash-vfs-relative-overlay.m
@@ -1,7 +1,7 @@
 // REQUIRES: crash-recovery, shell
 
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// XFAIL: target={{.*-windows-gnu}}
 
 // RUN: rm -rf %t
 // RUN: mkdir -p %t/i %t/m %t

diff  --git a/clang/test/Modules/crash-vfs-umbrella-frameworks.m b/clang/test/Modules/crash-vfs-umbrella-frameworks.m
index 8cd3afb731b6..d097ffb81a03 100644
--- a/clang/test/Modules/crash-vfs-umbrella-frameworks.m
+++ b/clang/test/Modules/crash-vfs-umbrella-frameworks.m
@@ -1,7 +1,7 @@
 // REQUIRES: crash-recovery, shell
 
 // FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?
-// XFAIL: windows-gnu
+// XFAIL: target={{.*-windows-gnu}}
 
 // RUN: rm -rf %t
 // RUN: mkdir -p %t/i %t/m %t

diff  --git a/clang/test/SemaTemplate/instantiation-depth-default.cpp b/clang/test/SemaTemplate/instantiation-depth-default.cpp
index 61619623c97c..852621aa89e7 100644
--- a/clang/test/SemaTemplate/instantiation-depth-default.cpp
+++ b/clang/test/SemaTemplate/instantiation-depth-default.cpp
@@ -17,4 +17,4 @@ template<int N, typename T> struct X : X<N+1, T*> {};
 X<0, int> x; // expected-note {{in instantiation of}}
 
 // FIXME: It crashes. Investigating.
-// UNSUPPORTED: windows-gnu
+// UNSUPPORTED: target={{.*-windows-gnu}}


        


More information about the cfe-commits mailing list