diff --git a/bolt/test/runtime/X86/basic-instrumentation.test b/bolt/test/runtime/X86/basic-instrumentation.test --- a/bolt/test/runtime/X86/basic-instrumentation.test +++ b/bolt/test/runtime/X86/basic-instrumentation.test @@ -1,6 +1,6 @@ # Try to instrument a very fast test. Input bin will not execute any code during # runtime besides returning zero in main, so it is a good trivial case. -REQUIRES: system-linux +REQUIRES: system-linux,bolt-runtime RUN: %clang %p/Inputs/basic-instrumentation.s -Wl,-q -o %t.exe RUN: llvm-bolt %t.exe -o %t --instrument \ diff --git a/bolt/test/runtime/X86/exceptions-instrumentation.test b/bolt/test/runtime/X86/exceptions-instrumentation.test --- a/bolt/test/runtime/X86/exceptions-instrumentation.test +++ b/bolt/test/runtime/X86/exceptions-instrumentation.test @@ -1,6 +1,6 @@ # Check instrumentation of C++ code with exceptions -REQUIRES: system-linux +REQUIRES: system-linux,bolt-runtime RUN: %clangxx %cxxflags -no-pie %p/Inputs/exceptions_split.cpp -Wl,-q -g -o %t_exc_split RUN: llvm-bolt %t_exc_split -o %t.exc --instrument --instrumentation-file=%t.fdata diff --git a/bolt/test/runtime/X86/instrumentation-indirect.c b/bolt/test/runtime/X86/instrumentation-indirect.c --- a/bolt/test/runtime/X86/instrumentation-indirect.c +++ b/bolt/test/runtime/X86/instrumentation-indirect.c @@ -36,7 +36,7 @@ } /* -REQUIRES: system-linux && lit-max-individual-test-time +REQUIRES: system-linux,bolt-runtime,lit-max-individual-test-time RUN: %clang %cflags %s -o %t.exe -Wl,-q -pie -fpie diff --git a/bolt/test/runtime/X86/pie-exceptions-failed-split.test b/bolt/test/runtime/X86/pie-exceptions-failed-split.test --- a/bolt/test/runtime/X86/pie-exceptions-failed-split.test +++ b/bolt/test/runtime/X86/pie-exceptions-failed-split.test @@ -1,4 +1,4 @@ -REQUIRES: system-linux +REQUIRES: system-linux,bolt-runtime RUN: %clangxx %cxxflags -pie -fPIC %p/Inputs/pie-exceptions-failed-split.s \ RUN: -Wl,-q -o %t diff --git a/bolt/test/runtime/X86/pie-exceptions-split.test b/bolt/test/runtime/X86/pie-exceptions-split.test --- a/bolt/test/runtime/X86/pie-exceptions-split.test +++ b/bolt/test/runtime/X86/pie-exceptions-split.test @@ -1,7 +1,7 @@ ## Check that BOLT successfully splits C++ exception-handling code for ## PIEs or shared objects. -REQUIRES: system-linux +REQUIRES: system-linux,bolt-runtime RUN: %clangxx %cxxflags -pie -fPIC %p/Inputs/exceptions_split.cpp -Wl,-q -o %t RUN: llvm-bolt %t -o %t.instr --instrument --instrumentation-file=%t.fdata diff --git a/bolt/test/runtime/X86/section-order.test b/bolt/test/runtime/X86/section-order.test --- a/bolt/test/runtime/X86/section-order.test +++ b/bolt/test/runtime/X86/section-order.test @@ -1,4 +1,4 @@ -REQUIRES: system-linux +REQUIRES: system-linux,bolt-runtime RUN: %clang %p/Inputs/basic-instrumentation.s -Wl,-q -o %t.exe RUN: llvm-bolt %t.exe -o %t --instrument diff --git a/bolt/test/runtime/meta-merge-fdata.test b/bolt/test/runtime/meta-merge-fdata.test --- a/bolt/test/runtime/meta-merge-fdata.test +++ b/bolt/test/runtime/meta-merge-fdata.test @@ -1,7 +1,7 @@ # Meta test using merge-fdata binary UNSUPPORTED: asan # Instrumentation currently only works on X86 -REQUIRES: x86_64-linux +REQUIRES: x86_64-linux,bolt-runtime # Instrumentation, should test: # - Direct branches