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

[SixWeining]

Summary

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

[SixWeining]

clang/test/Driver/XRay/xray-ignore-loops-flags.cpp

5

x86_64-linux is used here, so maybe we can remove the REQUIRES line directly?

[MaskRay]

clang/test/Driver/XRay/xray-ignore-loops-flags.cpp

1

I have cleaned up a few test/Driver/XRay tests last month, but these are what I did not touch.

I'll change these to specify a --target= and avoid target-different behaviors.

[SixWeining]

841ff7c6ca4c6fa9ff3ac6ba93e177462b7d668e addresses this issue.

clang/test/Driver/XRay/xray-ignore-loops-flags.cpp

 // This test ensures that when we invoke the clang compiler, that the -cc1
 // options include the -fxray-ignore-loops flag we provide in the
 // invocation.
 //
 // RUN: %clang -fxray-instrument -fxray-ignore-loops -target x86_64-linux- -### \
 // 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)-.*}}

clang/test/Driver/XRay/xray-instrumentation-bundles-flags.cpp

 // This test ensures that when we invoke the clang compiler, that the -cc1
 // options include the -fxray-instrumentation-bundle= flag we provide in the
 // invocation.
 //
 // RUN: %clang -fxray-instrument -fxray-instrumentation-bundle=function -### \
 // 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)-.*}}

clang/test/Driver/XRay/xray-mode-flags.cpp

 // RUN:     -fxray-modes=none \
 // RUN:     -### %s \
 // RUN:     2>&1 | FileCheck --check-prefixes NONE %s
 
 // BASIC: libclang_rt.xray-basic
 // 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)-.*}}

clang/test/Driver/XRay/xray-shared-noxray.cpp

 // RUN: %clangxx -shared -o /dev/null -v -fxray-instrument %s -###
 // RUN: %clangxx -shared -o /dev/null -v -fxray-instrument %s -### 2>&1 | \
 // RUN:     FileCheck %s --check-prefix=SHARED
 // RUN: %clangxx -static -o /dev/null -v -fxray-instrument %s -### -DMAIN
 // RUN: %clangxx -static -o /dev/null -v -fxray-instrument %s -### 2>&1 -DMAIN \
 // RUN:     | FileCheck %s --check-prefix=STATIC
 //
 // 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
 int main() { return foo(); }
 #endif