From 1d8f8d61e706f9f9f488962283c259e1e6ac185b Mon Sep 17 00:00:00 2001
From: parth-07 <partharora99160808@gmail.com>
Date: Sun, 28 Apr 2024 13:39:13 +0530
Subject: [PATCH] Add check-clad-exec-only target

This commit adds a new verification target, 'check-clad-exec-only'.
This target only verifies the 'CHECK-EXEC' filecheck checks. It is
helpful during the development phase when derivative code is expected to
change frequently.

Co-authored-by: Vassil Vassilev <v.g.vassilev@gmail.com>

Fixes #874
---
 .../source/user/DevelopersDocumentation.rst   | 27 +++++++++++++-
 test/Analyses/TBR.cpp                         |  2 +-
 test/Arrays/ArrayInputsForwardMode.C          |  4 +-
 test/Arrays/ArrayInputsReverseMode.C          |  6 +--
 test/Arrays/ArrayInputsVectorForwardMode.C    |  4 +-
 test/Arrays/Arrays.C                          |  6 +--
 test/CMakeLists.txt                           |  6 +--
 test/CUDA/ForwardMode.cu                      |  2 +-
 test/CUDA/GradientCuda.cu                     |  2 +-
 test/Enzyme/DifferentCladEnzymeDerivatives.C  |  2 +-
 test/Enzyme/ForwardMode.C                     |  2 +-
 test/Enzyme/FunctionPrototypesReverseMode.C   |  4 +-
 test/Enzyme/GradientsComparisonWithClad.C     |  4 +-
 .../LoopsReverseModeComparisonWithClad.C      |  4 +-
 test/ErrorEstimation/Assignments.C            |  2 +-
 test/ErrorEstimation/BasicOps.C               |  2 +-
 test/ErrorEstimation/ConditonalStatements.C   |  2 +-
 test/ErrorEstimation/LoopsAndArrays.C         |  2 +-
 test/ErrorEstimation/LoopsAndArraysExec.C     |  4 +-
 test/ExecOnly/TestExecOnly.C                  | 17 +++++++++
 test/ExecOnly/lit.local.cfg                   | 37 +++++++++++++++++++
 test/FirstDerivative/Assignments.C            |  2 +-
 test/FirstDerivative/BasicArithmeticAddSub.C  |  4 +-
 test/FirstDerivative/BasicArithmeticAll.C     |  4 +-
 test/FirstDerivative/BasicArithmeticMulDiv.C  |  2 +-
 test/FirstDerivative/BuiltinDerivatives.C     |  6 +--
 test/FirstDerivative/CallArguments.C          |  4 +-
 test/FirstDerivative/ClassMethodCall.C        |  4 +-
 test/FirstDerivative/CodeGenSimple.C          |  4 +-
 test/FirstDerivative/CompoundAssignments.C    |  2 +-
 test/FirstDerivative/DependencyTracking.C     |  2 +-
 test/FirstDerivative/DiffInterface.C          |  2 +-
 test/FirstDerivative/FunctionCalls.C          |  2 +-
 .../FunctionCallsWithResults.C                |  4 +-
 test/FirstDerivative/FunctionsInNamespaces.C  |  4 +-
 test/FirstDerivative/FunctionsOneVariable.C   |  2 +-
 test/FirstDerivative/Loops.C                  |  4 +-
 test/FirstDerivative/Namespaces.C             |  2 +-
 test/FirstDerivative/NonContinuous.C          |  4 +-
 test/FirstDerivative/Overloads.C              |  4 +-
 test/FirstDerivative/Recursive.C              |  4 +-
 test/FirstDerivative/StructGlobalObjects.C    |  2 +-
 test/FirstDerivative/StructMethodCall.C       |  4 +-
 test/FirstDerivative/Switch.C                 |  4 +-
 test/FirstDerivative/SwitchInit.C             |  4 +-
 test/FirstDerivative/TemplateFunction.C       |  2 +-
 test/FirstDerivative/UnsupportedOpsWarn.C     |  2 +-
 test/FirstDerivative/Variables.C              |  2 +-
 test/FirstDerivative/VirtualMethodsCall.C     |  4 +-
 test/ForwardMode/Casts.C                      |  4 +-
 test/ForwardMode/Functors.C                   |  4 +-
 test/ForwardMode/MemberFunctions.C            | 12 +++---
 test/ForwardMode/NonDifferentiable.C          |  4 +-
 test/ForwardMode/Pointer.C                    |  4 +-
 test/ForwardMode/ReferenceArguments.C         |  4 +-
 test/ForwardMode/SourceFnArg.C                |  4 +-
 test/ForwardMode/TemplateFunctors.C           |  6 +--
 test/ForwardMode/UserDefinedTypes.C           |  4 +-
 test/ForwardMode/VectorMode.C                 |  4 +-
 test/ForwardMode/VectorModeInterface.C        |  2 +-
 test/ForwardMode/constexprTest.C              |  4 +-
 test/Functors/Simple.C                        |  4 +-
 test/Gradient/Assignments.C                   |  6 +--
 test/Gradient/DiffInterface.C                 |  6 +--
 test/Gradient/FunctionCalls.C                 |  6 +--
 test/Gradient/Functors.C                      |  6 +--
 test/Gradient/Gradients.C                     |  6 +--
 test/Gradient/InterfaceCompatibility.c        |  6 +--
 test/Gradient/Loops.C                         |  6 +--
 test/Gradient/MemberFunctions.C               | 18 ++++-----
 test/Gradient/Pointers.C                      |  4 +-
 test/Gradient/PointersWithTBR.C               |  2 +-
 test/Gradient/Switch.C                        |  4 +-
 test/Gradient/SwitchInit.C                    |  4 +-
 test/Gradient/TemplateFunctors.C              |  6 +--
 test/Gradient/TestAgainstDiff.C               |  6 +--
 test/Gradient/TestTypeConversion.C            |  6 +--
 test/Gradient/UserDefinedTypes.C              |  6 +--
 test/Gradient/constexprTest.C                 |  6 +--
 test/Hessian/Arrays.C                         |  6 +--
 test/Hessian/BuiltinDerivatives.C             |  6 +--
 test/Hessian/Functors.C                       |  6 +--
 test/Hessian/Hessians.C                       |  6 +--
 test/Hessian/NestedFunctionCalls.C            |  6 +--
 test/Hessian/Pointers.C                       |  6 +--
 test/Hessian/TemplateFunctors.C               |  6 +--
 test/Hessian/constexprTest.C                  |  6 +--
 test/Hessian/testhessUtility.C                |  6 +--
 test/Jacobian/FunctionCalls.C                 |  6 +--
 test/Jacobian/Functors.C                      |  6 +--
 test/Jacobian/Jacobian.C                      |  6 +--
 test/Jacobian/Pointers.C                      |  6 +--
 test/Jacobian/TemplateFunctors.C              |  6 +--
 test/Jacobian/constexprTest.C                 |  6 +--
 test/Jacobian/testUtility.C                   |  6 +--
 test/Misc/CladArray.C                         |  2 +-
 test/Misc/CladMatrix.C                        |  2 +-
 test/Misc/ClangConsumers.cpp                  |  2 +-
 test/Misc/TimingsReport.C                     |  2 +-
 test/MixedDerivatives/Simple.C                |  4 +-
 test/NestedCalls/NestedCalls.C                |  6 +--
 test/NthDerivative/BasicArithmeticMul.C       |  4 +-
 test/NthDerivative/CustomDerivatives.C        |  4 +-
 test/NumericalDiff/GradientMultiArg.C         |  4 +-
 test/NumericalDiff/NumDiff.C                  |  4 +-
 test/NumericalDiff/PrintErrorNumDiff.C        |  4 +-
 test/NumericalDiff/PureCentralDiffCalls.C     |  2 +-
 test/NumericalDiff/UserDefinedPointers.C      |  2 +-
 test/ROOT/Hessian.C                           |  6 +--
 test/ROOT/Interface.C                         |  6 +--
 test/ROOT/TFormula.C                          |  6 +--
 test/lit.cfg                                  |  4 +-
 test/lit.site.cfg.in                          |  1 -
 113 files changed, 317 insertions(+), 239 deletions(-)
 create mode 100644 test/ExecOnly/TestExecOnly.C
 create mode 100644 test/ExecOnly/lit.local.cfg

diff --git a/docs/userDocs/source/user/DevelopersDocumentation.rst b/docs/userDocs/source/user/DevelopersDocumentation.rst
index b9e55465a..17e6be0b6 100644
--- a/docs/userDocs/source/user/DevelopersDocumentation.rst
+++ b/docs/userDocs/source/user/DevelopersDocumentation.rst
@@ -125,7 +125,32 @@ to understand for the new developers.
 
 Internal documentation can be visited 
 `here </en/latest/internalDocs/html/index.html>`_
- 
+
+Clad's Tests
+============
+
+Clad uses LLVM's testing infrastructure.
+`Here <https://llvm.org/docs/CommandGuide/lit.html>`__ is extensive information
+about the lit testing infrastructure in LLVM. The tests are located in the
+folder ``test`` and ``unittest``. The ``test`` folder contains lit-based tests
+which check the execution result and the produced code. The ``unittest`` folder
+contains GoogleTest-based tests which are compiled.
+
+The tests can be run with:
+
+.. code-block:: bash
+
+   cmake --build . --target check-clad
+
+When developing a feature sometimes fixing all the outputs of the tests to see
+if the feature does not break the execution of the programs is too laborious.
+For such cases we can run only the execution result checks and ignore
+temporarily the differences in the produced outputs with:
+
+.. code-block:: bash
+
+   cmake --build . --target check-clad-execonly
+
 
 Debugging Clang
 ==================
diff --git a/test/Analyses/TBR.cpp b/test/Analyses/TBR.cpp
index c87dfb93c..f7717673d 100644
--- a/test/Analyses/TBR.cpp
+++ b/test/Analyses/TBR.cpp
@@ -1,4 +1,4 @@
-// RUN: %cladclang -mllvm -debug-only=clad-tbr %s -I%S/../../include -oReverseLoops.out 2>&1 | FileCheck %s
+// RUN: %cladclang -mllvm -debug-only=clad-tbr %s -I%S/../../include -oReverseLoops.out 2>&1 | %filecheck %s
 // REQUIRES: asserts
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Arrays/ArrayInputsForwardMode.C b/test/Arrays/ArrayInputsForwardMode.C
index a7fdcac77..57559a6be 100644
--- a/test/Arrays/ArrayInputsForwardMode.C
+++ b/test/Arrays/ArrayInputsForwardMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oArrayInputsForwardMode.out 2>&1 | FileCheck %s
-// RUN: ./ArrayInputsForwardMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrayInputsForwardMode.out 2>&1 | %filecheck %s
+// RUN: ./ArrayInputsForwardMode.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Arrays/ArrayInputsReverseMode.C b/test/Arrays/ArrayInputsReverseMode.C
index 91931c51d..5efe17a8a 100644
--- a/test/Arrays/ArrayInputsReverseMode.C
+++ b/test/Arrays/ArrayInputsReverseMode.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | FileCheck %s
-// RUN: ./ArrayInputsReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | %filecheck %s
+// RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out
-// RUN: ./ArrayInputsReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Arrays/ArrayInputsVectorForwardMode.C b/test/Arrays/ArrayInputsVectorForwardMode.C
index 50f25739d..160f0d8bc 100644
--- a/test/Arrays/ArrayInputsVectorForwardMode.C
+++ b/test/Arrays/ArrayInputsVectorForwardMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oArrayInputsVectorForwardMode.out 2>&1 | FileCheck %s
-// RUN: ./ArrayInputsVectorForwardMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrayInputsVectorForwardMode.out 2>&1 | %filecheck %s
+// RUN: ./ArrayInputsVectorForwardMode.out | %filecheck_exec %s
 
 // XFAIL: asserts
 
diff --git a/test/Arrays/Arrays.C b/test/Arrays/Arrays.C
index 7dc35a336..07455accd 100644
--- a/test/Arrays/Arrays.C
+++ b/test/Arrays/Arrays.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
-// RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | %filecheck %s
+// RUN: ./Arrays.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oArrays.out
-// RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Arrays.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a26d935c0..557134fb9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,7 +33,7 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
   MAIN_CONFIG
-  ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
   )
 
 option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
@@ -53,9 +53,6 @@ set(CLAD_TEST_PARAMS
 
 # Unit tests
 list(APPEND CLAD_TEST_DEPS CladUnitTests)
-list(APPEND CLAD_TEST_PARAMS
-  clad_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
-  )
 
 add_custom_target(clad-test-depends DEPENDS ${CLAD_TEST_DEPS})
 set_target_properties(clad-test-depends PROPERTIES FOLDER "Clad tests")
@@ -65,6 +62,7 @@ set_target_properties(clad-test-depends PROPERTIES FOLDER "Clad tests")
 if(NOT LLVM_MAIN_SRC_DIR)
   set(LLVM_MAIN_SRC_DIR ${LLVM_BUILD_MAIN_SRC_DIR})
 endif()
+
 add_lit_testsuite(check-clad "Running the Clad regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   LIT ${LIT_COMMAND}
diff --git a/test/CUDA/ForwardMode.cu b/test/CUDA/ForwardMode.cu
index aeaeac3a6..502beb997 100644
--- a/test/CUDA/ForwardMode.cu
+++ b/test/CUDA/ForwardMode.cu
@@ -1,6 +1,6 @@
 // RUN: %cladclang_cuda -I%S/../../include %s -xc++ %cudasmlevel \
 // RUN: --cuda-path=%cudapath -L/usr/local/cuda/lib64 -lcudart_static \
-// RUN: -ldl -lrt -pthread -lm -lstdc++ -oForwardMode.out 2>&1 | FileCheck %s
+// RUN: -ldl -lrt -pthread -lm -lstdc++ -oForwardMode.out 2>&1 | %filecheck %s
 
 // RUN: ./ForwardMode.out
 
diff --git a/test/CUDA/GradientCuda.cu b/test/CUDA/GradientCuda.cu
index 404bfe9c7..5f3bd1bba 100644
--- a/test/CUDA/GradientCuda.cu
+++ b/test/CUDA/GradientCuda.cu
@@ -2,7 +2,7 @@
 // the device having all the dependencies also as device functions.
 
 // RUN: %cladclang_cuda -I%S/../../include  %s -fsyntax-only \
-// RUN: %cudasmlevel --cuda-path=%cudapath  -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cudasmlevel --cuda-path=%cudapath  -Xclang -verify 2>&1 | %filecheck %s
 
 // RUN: %cladclang_cuda -I%S/../../include %s -xc++ %cudasmlevel \
 // RUN: --cuda-path=%cudapath -L/usr/local/cuda/lib64 -lcudart_static \
diff --git a/test/Enzyme/DifferentCladEnzymeDerivatives.C b/test/Enzyme/DifferentCladEnzymeDerivatives.C
index ea1e2f97a..ac11daf8e 100644
--- a/test/Enzyme/DifferentCladEnzymeDerivatives.C
+++ b/test/Enzyme/DifferentCladEnzymeDerivatives.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | %filecheck %s
 // RUN: ./DifferentCladEnzymeDerivatives.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme
diff --git a/test/Enzyme/ForwardMode.C b/test/Enzyme/ForwardMode.C
index 808b68f97..88a9d9f81 100644
--- a/test/Enzyme/ForwardMode.C
+++ b/test/Enzyme/ForwardMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oEnzyme.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oEnzyme.out 2>&1 | %filecheck %s
 // RUN: ./Enzyme.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme
diff --git a/test/Enzyme/FunctionPrototypesReverseMode.C b/test/Enzyme/FunctionPrototypesReverseMode.C
index 0407b9fd5..4e24e4937 100644
--- a/test/Enzyme/FunctionPrototypesReverseMode.C
+++ b/test/Enzyme/FunctionPrototypesReverseMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseMode.out | FileCheck %s
-// RUN: ./ReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oReverseMode.out | %filecheck %s
+// RUN: ./ReverseMode.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme
 
diff --git a/test/Enzyme/GradientsComparisonWithClad.C b/test/Enzyme/GradientsComparisonWithClad.C
index 49fa88aef..a38e3856d 100644
--- a/test/Enzyme/GradientsComparisonWithClad.C
+++ b/test/Enzyme/GradientsComparisonWithClad.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | FileCheck %s
-// RUN: ./EnzymeGradients.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | %filecheck %s
+// RUN: ./EnzymeGradients.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Enzyme/LoopsReverseModeComparisonWithClad.C b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
index b1713f695..092e9ba21 100644
--- a/test/Enzyme/LoopsReverseModeComparisonWithClad.C
+++ b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 | FileCheck %s
-// RUN: ./EnzymeLoops.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 | %filecheck %s
+// RUN: ./EnzymeLoops.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ErrorEstimation/Assignments.C b/test/ErrorEstimation/Assignments.C
index 7c758ef53..9a7b442bc 100644
--- a/test/ErrorEstimation/Assignments.C
+++ b/test/ErrorEstimation/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oAssignments.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oAssignments.out %s 2>&1 | %filecheck %s
 // RUN: ./Assignments.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ErrorEstimation/BasicOps.C b/test/ErrorEstimation/BasicOps.C
index 3048bab3d..3487c652e 100644
--- a/test/ErrorEstimation/BasicOps.C
+++ b/test/ErrorEstimation/BasicOps.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ErrorEstimation/ConditonalStatements.C b/test/ErrorEstimation/ConditonalStatements.C
index db91578fd..795dfc3e1 100644
--- a/test/ErrorEstimation/ConditonalStatements.C
+++ b/test/ErrorEstimation/ConditonalStatements.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oCondStmts.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oCondStmts.out %s 2>&1 | %filecheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ErrorEstimation/LoopsAndArrays.C b/test/ErrorEstimation/LoopsAndArrays.C
index 80c1e38f3..682707efe 100644
--- a/test/ErrorEstimation/LoopsAndArrays.C
+++ b/test/ErrorEstimation/LoopsAndArrays.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | %filecheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ErrorEstimation/LoopsAndArraysExec.C b/test/ErrorEstimation/LoopsAndArraysExec.C
index 6b7ad6f4f..3b2acdfc5 100644
--- a/test/ErrorEstimation/LoopsAndArraysExec.C
+++ b/test/ErrorEstimation/LoopsAndArraysExec.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | FileCheck %s
-// RUN: ./LoopsAndArraysExec.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | %filecheck %s
+// RUN: ./LoopsAndArraysExec.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ExecOnly/TestExecOnly.C b/test/ExecOnly/TestExecOnly.C
new file mode 100644
index 000000000..41ace7c5f
--- /dev/null
+++ b/test/ExecOnly/TestExecOnly.C
@@ -0,0 +1,17 @@
+// RUN: %cladclang %s -I%S/../../include -oTestExecOnly.out 2>&1 | %filecheck %s
+// RUN: ./TestExecOnly.out | %filecheck_exec %s
+// CHECK-NOT: {{.*error|warning|note:.*}}
+
+#include "clad/Differentiator/Differentiator.h"
+
+double sq(double x) { return x*x; }
+
+// CHECK: This check must not trigger
+
+extern "C" int printf(const char*,...);
+int main() {
+  auto dsq = clad::differentiate(sq, "x");
+  printf("dsq(1.)=%f\n", dsq.execute(1.));
+}
+
+// CHECK-EXEC: dsq(1.)=1.0
diff --git a/test/ExecOnly/lit.local.cfg b/test/ExecOnly/lit.local.cfg
new file mode 100644
index 000000000..ab1defb3b
--- /dev/null
+++ b/test/ExecOnly/lit.local.cfg
@@ -0,0 +1,37 @@
+# -*- Python -*-
+
+import platform
+
+import lit.formats
+
+import os
+
+class ExecOnlyFormat(lit.formats.ShTest):
+    def getTestsInDirectory(self, testSuite, path_in_suite, litConfig, localConfig):
+        cur_path = os.path.dirname(__file__)
+        tests = list()
+        # FIXME: Find the tests we put in the ExecOnly folder. This currently
+        # fails with some sort of obscure error in pickle:
+        #  _pickle.PicklingError: Can't pickle <class
+        #   'lit.TestingConfig.ExecOnlyFormat'>: attribute lookup ExecOnlyFormat
+        #   on lit.TestingConfig failed
+        #
+        #for t in super().getTestsInDirectory(testSuite, path_in_suite, litConfig, localConfig):
+        #    tests.append(t)
+
+        base = os.path.abspath(os.path.join(cur_path, os.pardir))
+        tests.extend(lit.discovery.find_tests_for_inputs(lit_config, [base]))
+        for test in tests :
+            # Ideally, just 'true', instead of 'xargs -0 true', should work as
+            # well.  However, due to some lit-specific issue piping to true from
+            # Clang always returns an error.
+            test.config.substitutions.insert(0, ('%filecheck', 'xargs -0 true '))
+            # FIXME: We run there the tests twice but it seems there is nothing
+            # else we could do.
+            test.config.name = "clad Execution-Only"
+            yield test
+
+# We exclude the `ExecOnly` folder from the main configuration so that here we
+# can add a custom formatter that re-runs the existing tests by ignoring the
+# produced output comparisons but checks only the final excution result.
+config.test_format = ExecOnlyFormat()
diff --git a/test/FirstDerivative/Assignments.C b/test/FirstDerivative/Assignments.C
index 1b680d0a9..d17ed16d2 100644
--- a/test/FirstDerivative/Assignments.C
+++ b/test/FirstDerivative/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oAssignments.out 2>&1 | %filecheck %s
 // RUN: ./Assignments.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/BasicArithmeticAddSub.C b/test/FirstDerivative/BasicArithmeticAddSub.C
index a69483586..b40c53b77 100644
--- a/test/FirstDerivative/BasicArithmeticAddSub.C
+++ b/test/FirstDerivative/BasicArithmeticAddSub.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAddSub.out 2>&1 | FileCheck %s
-// RUN: ./BasicArithmeticAddSub.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAddSub.out 2>&1 | %filecheck %s
+// RUN: ./BasicArithmeticAddSub.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/BasicArithmeticAll.C b/test/FirstDerivative/BasicArithmeticAll.C
index 0ac24212d..296cabda3 100644
--- a/test/FirstDerivative/BasicArithmeticAll.C
+++ b/test/FirstDerivative/BasicArithmeticAll.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAll.out 2>&1 | FileCheck %s
-// RUN: ./BasicArithmeticAll.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAll.out 2>&1 | %filecheck %s
+// RUN: ./BasicArithmeticAll.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/BasicArithmeticMulDiv.C b/test/FirstDerivative/BasicArithmeticMulDiv.C
index b02506b36..adea5232e 100644
--- a/test/FirstDerivative/BasicArithmeticMulDiv.C
+++ b/test/FirstDerivative/BasicArithmeticMulDiv.C
@@ -1,5 +1,5 @@
 // RUN: %cladclang %s -I%S/../../include -oBasicArithmeticMulDiv.out 2>&1 | FileCheck  %s
-// RUN: ./BasicArithmeticMulDiv.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./BasicArithmeticMulDiv.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/BuiltinDerivatives.C b/test/FirstDerivative/BuiltinDerivatives.C
index f291253ce..aae7f3994 100644
--- a/test/FirstDerivative/BuiltinDerivatives.C
+++ b/test/FirstDerivative/BuiltinDerivatives.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out 2>&1 | FileCheck %s
-// RUN: ./BuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out 2>&1 | %filecheck %s
+// RUN: ./BuiltinDerivatives.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out
-// RUN: ./BuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./BuiltinDerivatives.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/CallArguments.C b/test/FirstDerivative/CallArguments.C
index 7c84dfbff..9c543a655 100644
--- a/test/FirstDerivative/CallArguments.C
+++ b/test/FirstDerivative/CallArguments.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oCallArguments.out 2>&1 | FileCheck %s
-// RUN: ./CallArguments.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oCallArguments.out 2>&1 | %filecheck %s
+// RUN: ./CallArguments.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/ClassMethodCall.C b/test/FirstDerivative/ClassMethodCall.C
index 76992bca2..3459b0644 100644
--- a/test/FirstDerivative/ClassMethodCall.C
+++ b/test/FirstDerivative/ClassMethodCall.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oClassMethods.out 2>&1 | FileCheck %s
-// RUN: ./ClassMethods.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oClassMethods.out 2>&1 | %filecheck %s
+// RUN: ./ClassMethods.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/CodeGenSimple.C b/test/FirstDerivative/CodeGenSimple.C
index 4ff77e806..aef969600 100644
--- a/test/FirstDerivative/CodeGenSimple.C
+++ b/test/FirstDerivative/CodeGenSimple.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oCodeGenSimple.out 2>&1 | FileCheck %s
-// RUN: ./CodeGenSimple.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oCodeGenSimple.out 2>&1 | %filecheck %s
+// RUN: ./CodeGenSimple.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/CompoundAssignments.C b/test/FirstDerivative/CompoundAssignments.C
index 490f26349..f66426486 100644
--- a/test/FirstDerivative/CompoundAssignments.C
+++ b/test/FirstDerivative/CompoundAssignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oCompoundAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oCompoundAssignments.out 2>&1 | %filecheck %s
 // RUN: ./CompoundAssignments.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/DependencyTracking.C b/test/FirstDerivative/DependencyTracking.C
index b3304b449..600b96f38 100644
--- a/test/FirstDerivative/DependencyTracking.C
+++ b/test/FirstDerivative/DependencyTracking.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include 2>&1 -fsyntax-only | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include 2>&1 -fsyntax-only | %filecheck %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/DiffInterface.C b/test/FirstDerivative/DiffInterface.C
index dda26f136..df764e493 100644
--- a/test/FirstDerivative/DiffInterface.C
+++ b/test/FirstDerivative/DiffInterface.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/FirstDerivative/FunctionCalls.C b/test/FirstDerivative/FunctionCalls.C
index 79e5a6b8f..28e659c5d 100644
--- a/test/FirstDerivative/FunctionCalls.C
+++ b/test/FirstDerivative/FunctionCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladnumdiffclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/FunctionCallsWithResults.C b/test/FirstDerivative/FunctionCallsWithResults.C
index 4549e4d85..3ee69445b 100644
--- a/test/FirstDerivative/FunctionCallsWithResults.C
+++ b/test/FirstDerivative/FunctionCallsWithResults.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctionCallsWithResults.out 2>&1 | FileCheck %s
-// RUN: ./FunctionCallsWithResults.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctionCallsWithResults.out 2>&1 | %filecheck %s
+// RUN: ./FunctionCallsWithResults.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
 #include <random>
diff --git a/test/FirstDerivative/FunctionsInNamespaces.C b/test/FirstDerivative/FunctionsInNamespaces.C
index 18ef5a817..edb1f7b64 100644
--- a/test/FirstDerivative/FunctionsInNamespaces.C
+++ b/test/FirstDerivative/FunctionsInNamespaces.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctionsInNamespaces.out 2>&1 | FileCheck %s
-// RUN: ./FunctionsInNamespaces.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctionsInNamespaces.out 2>&1 | %filecheck %s
+// RUN: ./FunctionsInNamespaces.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/FunctionsOneVariable.C b/test/FirstDerivative/FunctionsOneVariable.C
index 33783d7a0..5c07ea2ee 100644
--- a/test/FirstDerivative/FunctionsOneVariable.C
+++ b/test/FirstDerivative/FunctionsOneVariable.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/FirstDerivative/Loops.C b/test/FirstDerivative/Loops.C
index 03257ff34..6d408f766 100644
--- a/test/FirstDerivative/Loops.C
+++ b/test/FirstDerivative/Loops.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -std=c++17 -I%S/../../include -oLoops.out 2>&1 | FileCheck %s
-// RUN: ./Loops.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -std=c++17 -I%S/../../include -oLoops.out 2>&1 | %filecheck %s
+// RUN: ./Loops.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/Namespaces.C b/test/FirstDerivative/Namespaces.C
index 2142eabcf..2704b15fe 100644
--- a/test/FirstDerivative/Namespaces.C
+++ b/test/FirstDerivative/Namespaces.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oNamespaces.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oNamespaces.out 2>&1 | %filecheck %s
 // RUN: ./Namespaces.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/NonContinuous.C b/test/FirstDerivative/NonContinuous.C
index b9359dfe8..24cf5b687 100644
--- a/test/FirstDerivative/NonContinuous.C
+++ b/test/FirstDerivative/NonContinuous.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oNonContinuous.out 2>&1 | FileCheck %s
-// RUN: ./NonContinuous.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oNonContinuous.out 2>&1 | %filecheck %s
+// RUN: ./NonContinuous.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/Overloads.C b/test/FirstDerivative/Overloads.C
index 025fd7e0b..3dc549c1b 100644
--- a/test/FirstDerivative/Overloads.C
+++ b/test/FirstDerivative/Overloads.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oOverloads.out 2>&1 | FileCheck %s
-// RUN: ./Overloads.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oOverloads.out 2>&1 | %filecheck %s
+// RUN: ./Overloads.out | %filecheck_exec %s
 // XFAIL: asserts
 //CHECK-NOT: {{.*error|warning|note:.*}}
 // XFAIL: target={{i586.*}}
diff --git a/test/FirstDerivative/Recursive.C b/test/FirstDerivative/Recursive.C
index dd103aafd..e6d77d8ea 100644
--- a/test/FirstDerivative/Recursive.C
+++ b/test/FirstDerivative/Recursive.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oRecursive.out 2>&1 | FileCheck %s
-// RUN: ./Recursive.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oRecursive.out 2>&1 | %filecheck %s
+// RUN: ./Recursive.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/StructGlobalObjects.C b/test/FirstDerivative/StructGlobalObjects.C
index ca45b6545..784a68188 100644
--- a/test/FirstDerivative/StructGlobalObjects.C
+++ b/test/FirstDerivative/StructGlobalObjects.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include 2>&1 | %filecheck %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/StructMethodCall.C b/test/FirstDerivative/StructMethodCall.C
index d00701afd..99ab6f5b3 100644
--- a/test/FirstDerivative/StructMethodCall.C
+++ b/test/FirstDerivative/StructMethodCall.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oStructMethodCall.out 2>&1 | FileCheck %s
-// RUN: ./StructMethodCall.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oStructMethodCall.out 2>&1 | %filecheck %s
+// RUN: ./StructMethodCall.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/Switch.C b/test/FirstDerivative/Switch.C
index 7e24133c6..77cf19310 100644
--- a/test/FirstDerivative/Switch.C
+++ b/test/FirstDerivative/Switch.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 | FileCheck %s
-// RUN: ./Switch.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 | %filecheck %s
+// RUN: ./Switch.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/SwitchInit.C b/test/FirstDerivative/SwitchInit.C
index a95c2be27..44bdf5fd7 100644
--- a/test/FirstDerivative/SwitchInit.C
+++ b/test/FirstDerivative/SwitchInit.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | FileCheck %s
-// RUN: ./SwitchInit.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | %filecheck %s
+// RUN: ./SwitchInit.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/TemplateFunction.C b/test/FirstDerivative/TemplateFunction.C
index f808d5da5..b85687c32 100644
--- a/test/FirstDerivative/TemplateFunction.C
+++ b/test/FirstDerivative/TemplateFunction.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include 2>&1 | %filecheck %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/UnsupportedOpsWarn.C b/test/FirstDerivative/UnsupportedOpsWarn.C
index 107b9d688..6c85f44dc 100644
--- a/test/FirstDerivative/UnsupportedOpsWarn.C
+++ b/test/FirstDerivative/UnsupportedOpsWarn.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/FirstDerivative/Variables.C b/test/FirstDerivative/Variables.C
index a9d7c6202..1bfb93527 100644
--- a/test/FirstDerivative/Variables.C
+++ b/test/FirstDerivative/Variables.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oVariables.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oVariables.out 2>&1 | %filecheck %s
 // RUN: ./Variables.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/FirstDerivative/VirtualMethodsCall.C b/test/FirstDerivative/VirtualMethodsCall.C
index 606625a5d..dd1d1950a 100644
--- a/test/FirstDerivative/VirtualMethodsCall.C
+++ b/test/FirstDerivative/VirtualMethodsCall.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oVirtualMethodsCall.out 2>&1 | FileCheck %s
-// RUN: ./VirtualMethodsCall.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oVirtualMethodsCall.out 2>&1 | %filecheck %s
+// RUN: ./VirtualMethodsCall.out | %filecheck_exec %s
 // XFAIL: asserts
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ForwardMode/Casts.C b/test/ForwardMode/Casts.C
index 58a66d8da..74e536003 100644
--- a/test/ForwardMode/Casts.C
+++ b/test/ForwardMode/Casts.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oCasts.out 2>&1 | FileCheck %s
-// RUN: ./Casts.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oCasts.out 2>&1 | %filecheck %s
+// RUN: ./Casts.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ForwardMode/Functors.C b/test/ForwardMode/Functors.C
index f7e54b054..ee15045d3 100644
--- a/test/ForwardMode/Functors.C
+++ b/test/ForwardMode/Functors.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | FileCheck %s
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ForwardMode/MemberFunctions.C b/test/ForwardMode/MemberFunctions.C
index 70c8a3c71..4357e7de0 100644
--- a/test/ForwardMode/MemberFunctions.C
+++ b/test/ForwardMode/MemberFunctions.C
@@ -1,9 +1,9 @@
-// RUN: %cladclang %s -I%S/../../include -oMemberFunctions.out 2>&1 | FileCheck %s
-// RUN: ./MemberFunctions.out | FileCheck -check-prefix=CHECK-EXEC %s
-// RUN: %cladclang -std=c++14 %s -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | FileCheck %s
-// RUN: ./MemberFunctions-cpp14.out | FileCheck -check-prefix=CHECK-EXEC %s
-// RUN: %cladclang -std=c++17 %s -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | FileCheck %s
-// RUN: ./MemberFunctions-cpp17.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oMemberFunctions.out 2>&1 | %filecheck %s
+// RUN: ./MemberFunctions.out | %filecheck_exec %s
+// RUN: %cladclang -std=c++14 %s -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | %filecheck %s
+// RUN: ./MemberFunctions-cpp14.out | %filecheck_exec %s
+// RUN: %cladclang -std=c++17 %s -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | %filecheck %s
+// RUN: ./MemberFunctions-cpp17.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ForwardMode/NonDifferentiable.C b/test/ForwardMode/NonDifferentiable.C
index c6608d57c..d74dbab3f 100644
--- a/test/ForwardMode/NonDifferentiable.C
+++ b/test/ForwardMode/NonDifferentiable.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oNonDifferentiable.out 2>&1 | FileCheck %s
-// RUN: ./NonDifferentiable.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oNonDifferentiable.out 2>&1 | %filecheck %s
+// RUN: ./NonDifferentiable.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #define non_differentiable __attribute__((annotate("another_attribute"), annotate("non_differentiable")))
diff --git a/test/ForwardMode/Pointer.C b/test/ForwardMode/Pointer.C
index bb1edfdde..cfe3598a1 100644
--- a/test/ForwardMode/Pointer.C
+++ b/test/ForwardMode/Pointer.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oPointer.out 2>&1 | FileCheck %s
-// RUN: ./Pointer.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oPointer.out 2>&1 | %filecheck %s
+// RUN: ./Pointer.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ForwardMode/ReferenceArguments.C b/test/ForwardMode/ReferenceArguments.C
index 4f28984ed..0800bdacb 100644
--- a/test/ForwardMode/ReferenceArguments.C
+++ b/test/ForwardMode/ReferenceArguments.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oReferenceArguments.out 2>&1 | FileCheck %s
-// RUN: ./ReferenceArguments.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oReferenceArguments.out 2>&1 | %filecheck %s
+// RUN: ./ReferenceArguments.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ForwardMode/SourceFnArg.C b/test/ForwardMode/SourceFnArg.C
index 85f82b2f5..9b0db5171 100644
--- a/test/ForwardMode/SourceFnArg.C
+++ b/test/ForwardMode/SourceFnArg.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oSourceFnArg.out 2>&1 | FileCheck %s
-// RUN: ./SourceFnArg.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oSourceFnArg.out 2>&1 | %filecheck %s
+// RUN: ./SourceFnArg.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/ForwardMode/TemplateFunctors.C b/test/ForwardMode/TemplateFunctors.C
index 8e15db065..2d3961cd9 100644
--- a/test/ForwardMode/TemplateFunctors.C
+++ b/test/ForwardMode/TemplateFunctors.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | FileCheck %s 
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
@@ -129,4 +129,4 @@ int main() {
   TEST_LONG_DOUBLE(E_ld, 7, 9);              // CHECK-EXEC: {630.00, 630.00}
   TEST_DOUBLE(EConstVolatile_double, 7, 9);  // CHECK-EXEC: {70.00, 70.00}
   TEST_LONG_DOUBLE(EConstVolatile_ld, 7, 9); // CHECK-EXEC: {630.00, 630.00}
-}
\ No newline at end of file
+}
diff --git a/test/ForwardMode/UserDefinedTypes.C b/test/ForwardMode/UserDefinedTypes.C
index 39b3353c7..65f4cc3d6 100644
--- a/test/ForwardMode/UserDefinedTypes.C
+++ b/test/ForwardMode/UserDefinedTypes.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out | FileCheck %s
-// RUN: ./UserDefinedTypes.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out | %filecheck %s
+// RUN: ./UserDefinedTypes.out | %filecheck_exec %s
 
 // XFAIL: asserts
 
diff --git a/test/ForwardMode/VectorMode.C b/test/ForwardMode/VectorMode.C
index 4491ccd65..9ee1e10de 100644
--- a/test/ForwardMode/VectorMode.C
+++ b/test/ForwardMode/VectorMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oVectorMode.out 2>&1 | FileCheck %s
-// RUN: ./VectorMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oVectorMode.out 2>&1 | %filecheck %s
+// RUN: ./VectorMode.out | %filecheck_exec %s
 
 // XFAIL: asserts
 
diff --git a/test/ForwardMode/VectorModeInterface.C b/test/ForwardMode/VectorModeInterface.C
index 916eaf41f..ea186e8f4 100644
--- a/test/ForwardMode/VectorModeInterface.C
+++ b/test/ForwardMode/VectorModeInterface.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 // XFAIL: asserts
 
diff --git a/test/ForwardMode/constexprTest.C b/test/ForwardMode/constexprTest.C
index d219a4924..5ead5b1b0 100644
--- a/test/ForwardMode/constexprTest.C
+++ b/test/ForwardMode/constexprTest.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | FileCheck %s
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | %filecheck %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/Functors/Simple.C b/test/Functors/Simple.C
index 9358113fa..d24dd7d17 100644
--- a/test/Functors/Simple.C
+++ b/test/Functors/Simple.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oSimpleFunctor.out 2>&1 | FileCheck %s
-// RUN: ./SimpleFunctor.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oSimpleFunctor.out 2>&1 | %filecheck %s
+// RUN: ./SimpleFunctor.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/Assignments.C b/test/Gradient/Assignments.C
index c6542b09a..1fe5a77ef 100644
--- a/test/Gradient/Assignments.C
+++ b/test/Gradient/Assignments.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseAssignments.out 2>&1 | FileCheck %s
-// RUN: ./ReverseAssignments.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oReverseAssignments.out 2>&1 | %filecheck %s
+// RUN: ./ReverseAssignments.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oReverseAssignments.out
-// RUN: ./ReverseAssignments.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./ReverseAssignments.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/DiffInterface.C b/test/Gradient/DiffInterface.C
index e7a49d365..8f7b7df46 100644
--- a/test/Gradient/DiffInterface.C
+++ b/test/Gradient/DiffInterface.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oGradientDiffInterface.out 2>&1 | FileCheck %s
-// RUN: ./GradientDiffInterface.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oGradientDiffInterface.out 2>&1 | %filecheck %s
+// RUN: ./GradientDiffInterface.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oGradientDiffInterface.out
-// RUN: ./GradientDiffInterface.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./GradientDiffInterface.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/Gradient/FunctionCalls.C b/test/Gradient/FunctionCalls.C
index cffff026d..a6fcb6a19 100644
--- a/test/Gradient/FunctionCalls.C
+++ b/test/Gradient/FunctionCalls.C
@@ -1,7 +1,7 @@
-// RUN: %cladnumdiffclang -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out 2>&1 | FileCheck %s
-// RUN: ./FunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladnumdiffclang -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: ./FunctionCalls.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out
-// RUN: ./FunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./FunctionCalls.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/Functors.C b/test/Gradient/Functors.C
index a930de83f..981b2153d 100644
--- a/test/Gradient/Functors.C
+++ b/test/Gradient/Functors.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | FileCheck %s
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctors.out
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Gradients.C b/test/Gradient/Gradients.C
index 60049ae55..ac6d8b4e0 100644
--- a/test/Gradient/Gradients.C
+++ b/test/Gradient/Gradients.C
@@ -1,7 +1,7 @@
-// RUN: %cladnumdiffclang %s -std=c++17 -I%S/../../include -oGradients.out 2>&1 | FileCheck %s
-// RUN: ./Gradients.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladnumdiffclang %s -std=c++17 -I%S/../../include -oGradients.out 2>&1 | %filecheck %s
+// RUN: ./Gradients.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s  -I%S/../../include -oGradients.out
-// RUN: ./Gradients.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Gradients.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/InterfaceCompatibility.c b/test/Gradient/InterfaceCompatibility.c
index b46d0e13d..77ea7f039 100644
--- a/test/Gradient/InterfaceCompatibility.c
+++ b/test/Gradient/InterfaceCompatibility.c
@@ -1,7 +1,7 @@
-// RUN: %cladnumdiffclang %s  -I%S/../../include -oInterfaceCompatibility.out 2>&1 | FileCheck %s
-// RUN: ./InterfaceCompatibility.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oInterfaceCompatibility.out 2>&1 | %filecheck %s
+// RUN: ./InterfaceCompatibility.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s  -I%S/../../include -oInterfaceCompatibility.out
-// RUN: ./InterfaceCompatibility.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./InterfaceCompatibility.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Loops.C b/test/Gradient/Loops.C
index 0c3690e64..91470575e 100644
--- a/test/Gradient/Loops.C
+++ b/test/Gradient/Loops.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out 2>&1 | FileCheck %s
-// RUN: ./ReverseLoops.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out 2>&1 | %filecheck %s
+// RUN: ./ReverseLoops.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oReverseLoops.out
-// RUN: ./ReverseLoops.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./ReverseLoops.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/MemberFunctions.C b/test/Gradient/MemberFunctions.C
index 5956d80f7..ed6f6143d 100644
--- a/test/Gradient/MemberFunctions.C
+++ b/test/Gradient/MemberFunctions.C
@@ -1,17 +1,17 @@
-// RUN: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | FileCheck %s
-// RUN: ./MemberFunctions.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | %filecheck %s
+// RUN: ./MemberFunctions.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -fno-exceptions -I%S/../../include -oMemberFunctions.out
-// RUN: ./MemberFunctions.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./MemberFunctions.out | %filecheck_exec %s
 
-// RUN: %cladclang -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | FileCheck %s
-// RUN: ./MemberFunctions-cpp14.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out 2>&1 | %filecheck %s
+// RUN: ./MemberFunctions-cpp14.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out
-// RUN: ./MemberFunctions-cpp14.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./MemberFunctions-cpp14.out | %filecheck_exec %s
 
-// RUN: %cladclang -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | FileCheck %s
-// RUN: ./MemberFunctions-cpp17.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out 2>&1 | %filecheck %s
+// RUN: ./MemberFunctions-cpp17.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out
-// RUN: ./MemberFunctions-cpp17.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./MemberFunctions-cpp17.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/Pointers.C b/test/Gradient/Pointers.C
index 5c594ca18..7b97af377 100644
--- a/test/Gradient/Pointers.C
+++ b/test/Gradient/Pointers.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | FileCheck %s
-// RUN: ./Pointers.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: ./Pointers.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 // FIXME: This test does not work with enable-tbr flag, because the
diff --git a/test/Gradient/PointersWithTBR.C b/test/Gradient/PointersWithTBR.C
index b9017226c..f3cacddf4 100644
--- a/test/Gradient/PointersWithTBR.C
+++ b/test/Gradient/PointersWithTBR.C
@@ -1,5 +1,5 @@
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointersWithTBR.out
-// RUN: ./PointersWithTBR.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./PointersWithTBR.out | %filecheck_exec %s
 // XFAIL: *
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/Switch.C b/test/Gradient/Switch.C
index d8a1d24e0..fc4ef34f7 100644
--- a/test/Gradient/Switch.C
+++ b/test/Gradient/Switch.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 -lstdc++ -lm | FileCheck %s
-// RUN: ./Switch.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 -lstdc++ -lm | %filecheck %s
+// RUN: ./Switch.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/SwitchInit.C b/test/Gradient/SwitchInit.C
index e75fe84c0..008ae19b3 100644
--- a/test/Gradient/SwitchInit.C
+++ b/test/Gradient/SwitchInit.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 -lstdc++ -lm | FileCheck %s
-// RUN: ./SwitchInit.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 -lstdc++ -lm | %filecheck %s
+// RUN: ./SwitchInit.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/TemplateFunctors.C b/test/Gradient/TemplateFunctors.C
index 26eba43ee..e16c3088c 100644
--- a/test/Gradient/TemplateFunctors.C
+++ b/test/Gradient/TemplateFunctors.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | FileCheck %s
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTemplateFunctors.out
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/TestAgainstDiff.C b/test/Gradient/TestAgainstDiff.C
index 6ab0e4409..9378e3c54 100644
--- a/test/Gradient/TestAgainstDiff.C
+++ b/test/Gradient/TestAgainstDiff.C
@@ -1,8 +1,8 @@
-// RUN: %cladclang %s -I%S/../../include -oTestAgainstDiff.out 2>&1 | FileCheck %s
-// RUN: ./TestAgainstDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oTestAgainstDiff.out 2>&1 | %filecheck %s
+// RUN: ./TestAgainstDiff.out | %filecheck_exec %s
 
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTestAgainstDiff.out
-// RUN: ./TestAgainstDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./TestAgainstDiff.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/TestTypeConversion.C b/test/Gradient/TestTypeConversion.C
index 716bf97e7..11e86740e 100644
--- a/test/Gradient/TestTypeConversion.C
+++ b/test/Gradient/TestTypeConversion.C
@@ -1,7 +1,7 @@
-// RUN: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | FileCheck %s
-// RUN: ./TestTypeConversion.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | %filecheck %s
+// RUN: ./TestTypeConversion.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s  -I%S/../../include -oTestTypeConversion.out
-// RUN: ./TestTypeConversion.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./TestTypeConversion.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Gradient/UserDefinedTypes.C b/test/Gradient/UserDefinedTypes.C
index 37ac0bb37..adc3d479d 100644
--- a/test/Gradient/UserDefinedTypes.C
+++ b/test/Gradient/UserDefinedTypes.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out 2>&1 | FileCheck %s
-// RUN: ./UserDefinedTypes.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out 2>&1 | %filecheck %s
+// RUN: ./UserDefinedTypes.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oUserDefinedTypes.out
-// RUN: ./UserDefinedTypes.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./UserDefinedTypes.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Gradient/constexprTest.C b/test/Gradient/constexprTest.C
index 8f4978def..45c7cee15 100644
--- a/test/Gradient/constexprTest.C
+++ b/test/Gradient/constexprTest.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | FileCheck %s
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | %filecheck %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oconstexprTest.out
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/Hessian/Arrays.C b/test/Hessian/Arrays.C
index e8ea5d1b8..a15b0200f 100644
--- a/test/Hessian/Arrays.C
+++ b/test/Hessian/Arrays.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
-// RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | %filecheck %s
+// RUN: ./Arrays.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oArrays.out
-// RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Arrays.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Hessian/BuiltinDerivatives.C b/test/Hessian/BuiltinDerivatives.C
index 533c80a9b..0bc005901 100644
--- a/test/Hessian/BuiltinDerivatives.C
+++ b/test/Hessian/BuiltinDerivatives.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | FileCheck %s
-// RUN: ./HessianBuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | %filecheck %s
+// RUN: ./HessianBuiltinDerivatives.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oHessianBuiltinDerivatives.out
-// RUN: ./HessianBuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./HessianBuiltinDerivatives.out | %filecheck_exec %s
 
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/Hessian/Functors.C b/test/Hessian/Functors.C
index 7686f8e00..dd7c13a54 100644
--- a/test/Hessian/Functors.C
+++ b/test/Hessian/Functors.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | FileCheck %s
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctors.out
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/Hessians.C b/test/Hessian/Hessians.C
index 485c06e28..48fb798e5 100644
--- a/test/Hessian/Hessians.C
+++ b/test/Hessian/Hessians.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oHessians.out 2>&1 | FileCheck %s
-// RUN: ./Hessians.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oHessians.out 2>&1 | %filecheck %s
+// RUN: ./Hessians.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oHessians.out
-// RUN: ./Hessians.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Hessians.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Hessian/NestedFunctionCalls.C b/test/Hessian/NestedFunctionCalls.C
index e23077ec7..befb9d5ab 100644
--- a/test/Hessian/NestedFunctionCalls.C
+++ b/test/Hessian/NestedFunctionCalls.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oNestedFunctionCalls.out 2>&1 | FileCheck %s
-// RUN: ./NestedFunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oNestedFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: ./NestedFunctionCalls.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oNestedFunctionCalls.out
-// RUN: ./NestedFunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./NestedFunctionCalls.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Hessian/Pointers.C b/test/Hessian/Pointers.C
index 9cc959baf..1ad6dae72 100644
--- a/test/Hessian/Pointers.C
+++ b/test/Hessian/Pointers.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | FileCheck %s
-// RUN: ./Pointers.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: ./Pointers.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointers.out
-// RUN: ./Pointers.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Pointers.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/TemplateFunctors.C b/test/Hessian/TemplateFunctors.C
index 8f913f64d..9225dfd43 100644
--- a/test/Hessian/TemplateFunctors.C
+++ b/test/Hessian/TemplateFunctors.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | FileCheck %s 
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTemplateFunctors.out
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/constexprTest.C b/test/Hessian/constexprTest.C
index c73c9b2a4..f9e83d30a 100644
--- a/test/Hessian/constexprTest.C
+++ b/test/Hessian/constexprTest.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | FileCheck %s
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | %filecheck %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -std=c++14 -oconstexprTest.out
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Hessian/testhessUtility.C b/test/Hessian/testhessUtility.C
index de128d077..7a8e5a00d 100644
--- a/test/Hessian/testhessUtility.C
+++ b/test/Hessian/testhessUtility.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -otesthessUtility.out 2>&1 | FileCheck %s
-// RUN: ./testhessUtility.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -otesthessUtility.out 2>&1 | %filecheck %s
+// RUN: ./testhessUtility.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -otesthessUtility.out
-// RUN: ./testhessUtility.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./testhessUtility.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/FunctionCalls.C b/test/Jacobian/FunctionCalls.C
index 57cf0c11b..53cbf90d3 100644
--- a/test/Jacobian/FunctionCalls.C
+++ b/test/Jacobian/FunctionCalls.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctionCalls.out 2>&1 | FileCheck %s
-// RUN: ./FunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: ./FunctionCalls.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctionCalls.out
-// RUN: ./FunctionCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./FunctionCalls.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Jacobian/Functors.C b/test/Jacobian/Functors.C
index 001ac66ce..447bbaa57 100644
--- a/test/Jacobian/Functors.C
+++ b/test/Jacobian/Functors.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | FileCheck %s
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oFunctors.out
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/Jacobian.C b/test/Jacobian/Jacobian.C
index ffe52060c..1e423bf8a 100644
--- a/test/Jacobian/Jacobian.C
+++ b/test/Jacobian/Jacobian.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oJacobian.out 2>&1 | FileCheck %s
-// RUN: ./Jacobian.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oJacobian.out 2>&1 | %filecheck %s
+// RUN: ./Jacobian.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oJacobian.out
-// RUN: ./Jacobian.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Jacobian.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/Jacobian/Pointers.C b/test/Jacobian/Pointers.C
index 5ead9a5d6..b8e5ff9fe 100644
--- a/test/Jacobian/Pointers.C
+++ b/test/Jacobian/Pointers.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | FileCheck %s
-// RUN: ./Pointers.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: ./Pointers.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointers.out
-// RUN: ./Pointers.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Pointers.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/TemplateFunctors.C b/test/Jacobian/TemplateFunctors.C
index 95cd2b2d2..89f69d113 100644
--- a/test/Jacobian/TemplateFunctors.C
+++ b/test/Jacobian/TemplateFunctors.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | FileCheck %s 
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTemplateFunctors.out
-// RUN: ./TemplateFunctors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./TemplateFunctors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/constexprTest.C b/test/Jacobian/constexprTest.C
index a7ce4a357..0964a2a12 100644
--- a/test/Jacobian/constexprTest.C
+++ b/test/Jacobian/constexprTest.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | FileCheck %s
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -std=c++14 -oconstexprTest.out 2>&1 | %filecheck %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -std=c++14 -oconstexprTest.out
-// RUN: ./constexprTest.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./constexprTest.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Jacobian/testUtility.C b/test/Jacobian/testUtility.C
index 208708d9d..d76147a87 100644
--- a/test/Jacobian/testUtility.C
+++ b/test/Jacobian/testUtility.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -otestUtility.out 2>&1 | FileCheck %s
-// RUN: ./testUtility.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -otestUtility.out 2>&1 | %filecheck %s
+// RUN: ./testUtility.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -otestUtility.out
-// RUN: ./testUtility.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./testUtility.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Misc/CladArray.C b/test/Misc/CladArray.C
index 95b66ccb4..53734137e 100644
--- a/test/Misc/CladArray.C
+++ b/test/Misc/CladArray.C
@@ -1,5 +1,5 @@
 // RUN: %cladclang %s -I%S/../../include -oCladArray.out 2>&1
-// RUN: ./CladArray.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./CladArray.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Misc/CladMatrix.C b/test/Misc/CladMatrix.C
index 69a464ea0..1d7d0d205 100644
--- a/test/Misc/CladMatrix.C
+++ b/test/Misc/CladMatrix.C
@@ -1,5 +1,5 @@
 // RUN: %cladclang %s -I%S/../../include -oCladMatrix.out 2>&1
-// RUN: ./CladMatrix.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./CladMatrix.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"
diff --git a/test/Misc/ClangConsumers.cpp b/test/Misc/ClangConsumers.cpp
index 210c3060d..f445ec39b 100644
--- a/test/Misc/ClangConsumers.cpp
+++ b/test/Misc/ClangConsumers.cpp
@@ -1,6 +1,6 @@
 // RUN: %cladclang %s -I%S/../../include -oClangConsumers.out                  \
 // RUN:               -fms-compatibility -DMS_COMPAT -std=c++14 -fmodules      \
-// RUN:                -Xclang -print-stats 2>&1 | FileCheck %s
+// RUN:                -Xclang -print-stats 2>&1 | %filecheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 //
 // RUN: clang -xc -Xclang -add-plugin -Xclang clad -Xclang -load               \
diff --git a/test/Misc/TimingsReport.C b/test/Misc/TimingsReport.C
index 203593239..ae915217d 100644
--- a/test/Misc/TimingsReport.C
+++ b/test/Misc/TimingsReport.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oTimingsReport.out -ftime-report 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oTimingsReport.out -ftime-report 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 // CHECK-NOT: {{.*error|warning|note:.*}}
diff --git a/test/MixedDerivatives/Simple.C b/test/MixedDerivatives/Simple.C
index 1fc9c5726..d02fee82a 100644
--- a/test/MixedDerivatives/Simple.C
+++ b/test/MixedDerivatives/Simple.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oSimple.out -Xclang -verify 2>&1 | FileCheck %s
-// RUN: ./Simple.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oSimple.out -Xclang -verify 2>&1 | %filecheck %s
+// RUN: ./Simple.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NestedCalls/NestedCalls.C b/test/NestedCalls/NestedCalls.C
index dafe6ba87..e7ef5efc7 100644
--- a/test/NestedCalls/NestedCalls.C
+++ b/test/NestedCalls/NestedCalls.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oNestedCalls.out 2>&1 | FileCheck %s
-// RUN: ./NestedCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oNestedCalls.out 2>&1 | %filecheck %s
+// RUN: ./NestedCalls.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oNestedCalls.out
-// RUN: ./NestedCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./NestedCalls.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NthDerivative/BasicArithmeticMul.C b/test/NthDerivative/BasicArithmeticMul.C
index 51310198a..a29927117 100644
--- a/test/NthDerivative/BasicArithmeticMul.C
+++ b/test/NthDerivative/BasicArithmeticMul.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticMul2.out 2>&1 | FileCheck %s
-// RUN: ./BasicArithmeticMul2.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticMul2.out 2>&1 | %filecheck %s
+// RUN: ./BasicArithmeticMul2.out | %filecheck -check-prefix=CHECK-EXEC %s
 #include "clad/Differentiator/Differentiator.h"
 #include "clad/Differentiator/BuiltinDerivatives.h"
 
diff --git a/test/NthDerivative/CustomDerivatives.C b/test/NthDerivative/CustomDerivatives.C
index 676edbffc..022527504 100644
--- a/test/NthDerivative/CustomDerivatives.C
+++ b/test/NthDerivative/CustomDerivatives.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oCustomDerivative.out 2>&1 | FileCheck %s
-// RUN: ./CustomDerivative.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oCustomDerivative.out 2>&1 | %filecheck %s
+// RUN: ./CustomDerivative.out | %filecheck_exec %s
 #include "clad/Differentiator/Differentiator.h"
 #include "clad/Differentiator/BuiltinDerivatives.h"
 #include "../TestUtils.h"
diff --git a/test/NumericalDiff/GradientMultiArg.C b/test/NumericalDiff/GradientMultiArg.C
index 072c0664b..880a6d63e 100644
--- a/test/NumericalDiff/GradientMultiArg.C
+++ b/test/NumericalDiff/GradientMultiArg.C
@@ -1,7 +1,7 @@
 // RUN: %cladnumdiffclang %s -I%S/../../include -oGradientMultiArg.out 2>&1 | FileCheck -check-prefix=CHECK %s
-// RUN: ./GradientMultiArg.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./GradientMultiArg.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oGradientMultiArg.out
-// RUN: ./GradientMultiArg.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./GradientMultiArg.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NumericalDiff/NumDiff.C b/test/NumericalDiff/NumDiff.C
index 9ce187947..fd0235e51 100644
--- a/test/NumericalDiff/NumDiff.C
+++ b/test/NumericalDiff/NumDiff.C
@@ -1,7 +1,7 @@
 // RUN: %cladnumdiffclang %s -I%S/../../include -oNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
-// RUN: ./NumDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./NumDiff.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oNumDiff.out
-// RUN: ./NumDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./NumDiff.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"
 
diff --git a/test/NumericalDiff/PrintErrorNumDiff.C b/test/NumericalDiff/PrintErrorNumDiff.C
index 46e2e64d5..b4a05c98d 100644
--- a/test/NumericalDiff/PrintErrorNumDiff.C
+++ b/test/NumericalDiff/PrintErrorNumDiff.C
@@ -1,7 +1,7 @@
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -fprint-num-diff-errors %s -I%S/../../include -oPrintErrorNumDiff.out 2>&1 | FileCheck -check-prefix=CHECK %s
-// RUN: ./PrintErrorNumDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./PrintErrorNumDiff.out | %filecheck_exec %s
 // RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -fprint-num-diff-errors -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPrintErrorNumDiff.out
-// RUN: ./PrintErrorNumDiff.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./PrintErrorNumDiff.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NumericalDiff/PureCentralDiffCalls.C b/test/NumericalDiff/PureCentralDiffCalls.C
index 4ff628c33..b96b13515 100644
--- a/test/NumericalDiff/PureCentralDiffCalls.C
+++ b/test/NumericalDiff/PureCentralDiffCalls.C
@@ -1,5 +1,5 @@
 // RUN: %cladnumdiffclang %s -I%S/../../include -oPureCentralDiffCalls.out
-// -Xclang -verify 2>&1 RUN: ./PureCentralDiffCalls.out | FileCheck -check-prefix=CHECK-EXEC %s
+// -Xclang -verify 2>&1 RUN: ./PureCentralDiffCalls.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/NumericalDiff/UserDefinedPointers.C b/test/NumericalDiff/UserDefinedPointers.C
index be4320aae..13c14e47a 100644
--- a/test/NumericalDiff/UserDefinedPointers.C
+++ b/test/NumericalDiff/UserDefinedPointers.C
@@ -1,5 +1,5 @@
 // RUN: %cladnumdiffclang %s -I%S/../../include -oUserDefinedPointers.out -Xclang -verify 2>&1
-// RUN: ./UserDefinedPointers.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./UserDefinedPointers.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ROOT/Hessian.C b/test/ROOT/Hessian.C
index 9fc21d0a0..982981c2e 100644
--- a/test/ROOT/Hessian.C
+++ b/test/ROOT/Hessian.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oHessian.out 2>&1 | FileCheck %s
-// RUN: ./Hessian.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oHessian.out 2>&1 | %filecheck %s
+// RUN: ./Hessian.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oHessian.out
-// RUN: ./Hessian.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Hessian.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ROOT/Interface.C b/test/ROOT/Interface.C
index e032c1d3e..68ec63861 100644
--- a/test/ROOT/Interface.C
+++ b/test/ROOT/Interface.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oInterface.out 2>&1 | FileCheck %s
-// RUN: ./Interface.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oInterface.out 2>&1 | %filecheck %s
+// RUN: ./Interface.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oInterface.out
-// RUN: ./Interface.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Interface.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/ROOT/TFormula.C b/test/ROOT/TFormula.C
index f218bdd6a..64137fb24 100644
--- a/test/ROOT/TFormula.C
+++ b/test/ROOT/TFormula.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oTFormula.out 2>&1 | FileCheck %s
-// RUN: ./TFormula.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oTFormula.out 2>&1 | %filecheck %s
+// RUN: ./TFormula.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTFormula.out
-// RUN: ./TFormula.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./TFormula.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
diff --git a/test/lit.cfg b/test/lit.cfg
index d5bd3aff5..19ae580f8 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -199,8 +199,10 @@ for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/)\bclang\b(?!-)",
              substitution = substitution_ext
              break
     config.substitutions.append((pattern, substitution))
+config.excludes = ['ExecOnly']
 
-excludes = []
+config.substitutions.insert(0, ('%filecheck', 'FileCheck'))
+config.substitutions.insert(0, ('%filecheck_exec', 'FileCheck --check-prefix=CHECK-EXEC'))
 
 # Provide target_triple for use in XFAIL and XTARGET.
 ##config.target_triple = site_exp['target_triplet']
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 868d2db09..bc3d6f8d1 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -15,7 +15,6 @@ if config.target_triple == "" :
   config.target_triple = "@TARGET_TRIPLE@"
 config.shlibext = "@TARGET_SHLIBEXT@"
 config.have_enzyme = "@CLAD_ENABLE_ENZYME_BACKEND@"
-
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try: