vgvassilev · vgvassilev · May 29, 2024 · Apr 28, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"