[PATCH] D156089: [Driver][XRay][test] Convert more tests to check 'target=...' after 016785d9316d8c5abc5fdf3cdb86479095bbb677

[Lu Weining via Phabricator via cfe-commits]

SixWeining created this revision.
SixWeining added reviewers: probinson, MaskRay.
Herald added a subscriber: dberris.
Herald added a project: All.
SixWeining requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Fix https://github.com/llvm/llvm-project/issues/64028


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D156089

Files:
  clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
  clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
  clang/test/Driver/XRay/xray-mode-flags.cpp
  clang/test/Driver/XRay/xray-shared-noxray.cpp


Index: clang/test/Driver/XRay/xray-shared-noxray.cpp
===================================================================
--- clang/test/Driver/XRay/xray-shared-noxray.cpp
+++ clang/test/Driver/XRay/xray-shared-noxray.cpp
@@ -8,7 +8,8 @@
 // SHARED-NOT: {{clang_rt\.xray-}}
 // STATIC: {{clang_rt\.xray-}}
 //
-// REQUIRES: linux, enable_shared
+// REQUIRES: target={{.*-linux.*}}
+// REQUIRES: enable_shared
 int foo() { return 42; }
 
 #ifdef MAIN
Index: clang/test/Driver/XRay/xray-mode-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-mode-flags.cpp
+++ clang/test/Driver/XRay/xray-mode-flags.cpp
@@ -45,5 +45,5 @@
 // FDR: libclang_rt.xray-fdr
 // NONE-NOT: libclang_rt.xray-basic
 // NONE-NOT: libclang_rt.xray-fdr
-// REQUIRES: linux || freebsd
-// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
+// REQUIRES: target={{.*-(linux|freebsd).*}}
+// REQUIRES: target={{(amd64|x86_64|x86_64h|arm|aarch64|arm64)-.*}}
Index: clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
+++ clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
@@ -6,5 +6,5 @@
 // RUN:   -c -o - %s 2>&1 | FileCheck %s
 // CHECK:  -fxray-instrumentation-bundle=function
 //
-// REQUIRES: linux || freebsd
-// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
+// REQUIRES: target={{.*-(linux|freebsd).*}}
+// REQUIRES: target={{(amd64|x86_64|x86_64h|arm|aarch64|arm64)-.*}}
Index: clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
+++ clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
@@ -6,4 +6,4 @@
 // RUN:   -x c++ -emit-llvm -c -o - %s 2>&1 | FileCheck %s
 // CHECK:  -fxray-ignore-loops
 //
-// REQUIRES: x86_64 || x86_64h
+// REQUIRES: target={{(x86_64|x86_64h)-.*}}



Index: clang/test/Driver/XRay/xray-shared-noxray.cpp
===================================================================
--- clang/test/Driver/XRay/xray-shared-noxray.cpp
+++ clang/test/Driver/XRay/xray-shared-noxray.cpp
@@ -8,7 +8,8 @@
 // SHARED-NOT: {{clang_rt\.xray-}}
 // STATIC: {{clang_rt\.xray-}}
 //
-// REQUIRES: linux, enable_shared
+// REQUIRES: target={{.*-linux.*}}
+// REQUIRES: enable_shared
 int foo() { return 42; }
 
 #ifdef MAIN
Index: clang/test/Driver/XRay/xray-mode-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-mode-flags.cpp
+++ clang/test/Driver/XRay/xray-mode-flags.cpp
@@ -45,5 +45,5 @@
 // FDR: libclang_rt.xray-fdr
 // NONE-NOT: libclang_rt.xray-basic
 // NONE-NOT: libclang_rt.xray-fdr
-// REQUIRES: linux || freebsd
-// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
+// REQUIRES: target={{.*-(linux|freebsd).*}}
+// REQUIRES: target={{(amd64|x86_64|x86_64h|arm|aarch64|arm64)-.*}}
Index: clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
+++ clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp
@@ -6,5 +6,5 @@
 // RUN:   -c -o - %s 2>&1 | FileCheck %s
 // CHECK:  -fxray-instrumentation-bundle=function
 //
-// REQUIRES: linux || freebsd
-// REQUIRES: amd64 || x86_64 || x86_64h || arm || aarch64 || arm64
+// REQUIRES: target={{.*-(linux|freebsd).*}}
+// REQUIRES: target={{(amd64|x86_64|x86_64h|arm|aarch64|arm64)-.*}}
Index: clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
===================================================================
--- clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
+++ clang/test/Driver/XRay/xray-ignore-loops-flags.cpp
@@ -6,4 +6,4 @@
 // RUN:   -x c++ -emit-llvm -c -o - %s 2>&1 | FileCheck %s
 // CHECK:  -fxray-ignore-loops
 //
-// REQUIRES: x86_64 || x86_64h
+// REQUIRES: target={{(x86_64|x86_64h)-.*}}

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits