Make TBR default

Fixes:#760
vgvassilev · Feb 26, 2025 · 5ad0628 · 5ad0628
1 parent 0e3d04f
commit 5ad0628
Show file tree

Hide file tree

Showing 59 changed files with 104 additions and 104 deletions.
diff --git a/test/Analyses/ActivityReverse.cpp b/test/Analyses/ActivityReverse.cpp
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oActivity.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oActivity.out 2>&1 | %filecheck %s
 // RUN: ./Activity.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-va %s -I%S/../../include -oActivity.out
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-va -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oActivity.out
 // RUN: ./Activity.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/Analyses/TBR.cpp b/test/Analyses/TBR.cpp
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTBR.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oTBR.out | %filecheck %s
 // RUN: ./TBR.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oTBR.out
+// RUN: %cladclang %s -I%S/../../include -oTBR.out
 // RUN: ./TBR.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Arrays/ArrayInputsReverseMode.C b/test/Arrays/ArrayInputsReverseMode.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out
 // RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/CUDA/GradientCuda.cu b/test/CUDA/GradientCuda.cu
@@ -1,11 +1,11 @@
 // The Test checks whether a clad gradient can be successfully be generated on
 // the device having all the dependencies also as device functions.
 
-// RUN: %cladclang_cuda -I%S/../../include -fsyntax-only \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -fsyntax-only \
 // RUN:     --cuda-gpu-arch=%cudaarch --cuda-path=%cudapath -Xclang -verify \
 // RUN:     %s 2>&1 | %filecheck %s
 //
-// RUN: %cladclang_cuda -I%S/../../include --cuda-gpu-arch=%cudaarch \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include --cuda-gpu-arch=%cudaarch \
 // RUN:      --cuda-path=%cudapath %cudaldflags -oGradientCuda.out %s
 //
 // RUN: ./GradientCuda.out | %filecheck_exec %s

diff --git a/test/CUDA/GradientKernels.cu b/test/CUDA/GradientKernels.cu
@@ -1,8 +1,8 @@
-// RUN: %cladclang_cuda -I%S/../../include -fsyntax-only \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -fsyntax-only \
 // RUN:     --cuda-gpu-arch=%cudaarch --cuda-path=%cudapath  -Xclang -verify \
 // RUN:     %s 2>&1 | %filecheck %s
 //
-// RUN: %cladclang_cuda -I%S/../../include --cuda-path=%cudapath \
+// RUN: %cladclang_cuda -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include --cuda-path=%cudapath \
 // RUN:     --cuda-gpu-arch=%cudaarch %cudaldflags -oGradientKernels.out %s
 //
 // RUN: ./GradientKernels.out | %filecheck_exec %s

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 -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | %filecheck %s
 // RUN: ./DifferentCladEnzymeDerivatives.out
 // REQUIRES: Enzyme
 

diff --git a/test/Enzyme/FunctionPrototypesReverseMode.C b/test/Enzyme/FunctionPrototypesReverseMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseMode.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oReverseMode.out | %filecheck %s
 // RUN: ./ReverseMode.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 

diff --git a/test/Enzyme/GradientsComparisonWithClad.C b/test/Enzyme/GradientsComparisonWithClad.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | %filecheck %s
 // RUN: ./EnzymeGradients.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 

diff --git a/test/Enzyme/LoopsReverseModeComparisonWithClad.C b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oEnzymeLoops.out 2>&1 | %filecheck %s
 // RUN: ./EnzymeLoops.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 

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 -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -oAssignments.out %s 2>&1 | %filecheck %s
 // RUN: ./Assignments.out
 
 #include "clad/Differentiator/Differentiator.h"

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 -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 #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 -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -oCondStmts.out %s 2>&1 | %filecheck %s
 
 #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 -Xclang -plugin-arg-clad -Xclang -disable-tbr -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 

diff --git a/test/ErrorEstimation/LoopsAndArraysExec.C b/test/ErrorEstimation/LoopsAndArraysExec.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | %filecheck %s
 // RUN: ./LoopsAndArraysExec.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/Assignments.C b/test/Gradient/Assignments.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseAssignments.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oReverseAssignments.out
 // RUN: ./ReverseAssignments.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/DiffInterface.C b/test/Gradient/DiffInterface.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oGradientDiffInterface.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oGradientDiffInterface.out
 // RUN: ./GradientDiffInterface.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/FunctionCalls.C b/test/Gradient/FunctionCalls.C
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -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: %cladnumdiffclang -std=c++17 -Wno-writable-strings %s  -I%S/../../include -oFunctionCalls.out
 // RUN: ./FunctionCalls.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/Functors.C b/test/Gradient/Functors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oFunctors.out
 // RUN: ./Functors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/Gradients.C b/test/Gradient/Gradients.C
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang %s -std=c++17 -I%S/../../include -oGradients.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladnumdiffclang %s  -I%S/../../include -oGradients.out
 // RUN: ./Gradients.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/InterfaceCompatibility.c b/test/Gradient/InterfaceCompatibility.c
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang %s  -I%S/../../include -oInterfaceCompatibility.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladnumdiffclang %s  -I%S/../../include -oInterfaceCompatibility.out
 // RUN: ./InterfaceCompatibility.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/Lambdas.C b/test/Gradient/Lambdas.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oLambdas.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oLambdas.out 2>&1 | %filecheck %s
 // RUN: ./Lambdas.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oLambdas.out
+// RUN: %cladclang %s -I%S/../../include -oLambdas.out
 // RUN: ./Lambdas.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/Loops.C b/test/Gradient/Loops.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseLoops.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oReverseLoops.out
 // RUN: ./ReverseLoops.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/MemberFunctions.C b/test/Gradient/MemberFunctions.C
@@ -1,16 +1,16 @@
-// RUN: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -fno-exceptions -I%S/../../include -oMemberFunctions.out
 // 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: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -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: %cladclang -std=c++14 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp14.out
 // 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: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr -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: %cladclang -std=c++17 %s -fno-exceptions -I%S/../../include -oMemberFunctions-cpp17.out
 // RUN: ./MemberFunctions-cpp17.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/NonDifferentiable.C b/test/Gradient/NonDifferentiable.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oNonDifferentiable.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oNonDifferentiable.out 2>&1 | %filecheck %s
 // RUN: ./NonDifferentiable.out | %filecheck_exec %s
 
 #define non_differentiable __attribute__((annotate("another_attribute"), annotate("non_differentiable")))

diff --git a/test/Gradient/NonDifferentiableError.C b/test/Gradient/NonDifferentiableError.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
 
 #define non_differentiable __attribute__((annotate("non_differentiable")))
 

diff --git a/test/Gradient/Pointers.C b/test/Gradient/Pointers.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oPointers.out 2>&1 | %filecheck %s
 // RUN: ./Pointers.out | %filecheck_exec %s
 
 // FIXME: This test does not work with enable-tbr flag, because the

diff --git a/test/Gradient/PointersWithTBR.C b/test/Gradient/PointersWithTBR.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oPointersWithTBR.out
+// RUN: %cladclang %s -I%S/../../include -oPointersWithTBR.out
 // RUN: ./PointersWithTBR.out | %filecheck_exec %s
 // XFAIL: *
 

diff --git a/test/Gradient/STLCustomDerivatives.C b/test/Gradient/STLCustomDerivatives.C
@@ -1,7 +1,7 @@
 // XFAIL: asserts
-// RUN: %cladclang -std=c++14 %s -I%S/../../include -oSTLCustomDerivatives.out 2>&1 | %filecheck %s
+// RUN: %cladclang -std=c++14 -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oSTLCustomDerivatives.out 2>&1 | %filecheck %s
 // RUN: ./STLCustomDerivatives.out | %filecheck_exec %s
-// RUN: %cladclang -std=c++14 -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oSTLCustomDerivativesWithTBR.out
+// RUN: %cladclang -std=c++14 %s -I%S/../../include -oSTLCustomDerivativesWithTBR.out
 // RUN: ./STLCustomDerivativesWithTBR.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/Switch.C b/test/Gradient/Switch.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 -lm | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oSwitch.out 2>&1 -lm | %filecheck %s
 // RUN: ./Switch.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/SwitchInit.C b/test/Gradient/SwitchInit.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | %filecheck %s
 // RUN: ./SwitchInit.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/TemplateFunctors.C b/test/Gradient/TemplateFunctors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oTemplateFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oTemplateFunctors.out
 // RUN: ./TemplateFunctors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/TestAgainstDiff.C b/test/Gradient/TestAgainstDiff.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oTestAgainstDiff.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oTestAgainstDiff.out
 // RUN: ./TestAgainstDiff.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/TestTypeConversion.C b/test/Gradient/TestTypeConversion.C
@@ -1,6 +1,6 @@
-// RUN: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out 2>&1 | %filecheck %s
+// RUN: %cladnumdiffclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladnumdiffclang %s  -I%S/../../include -oTestTypeConversion.out
 // RUN: ./TestTypeConversion.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/UnaryMinus.C b/test/Gradient/UnaryMinus.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oUnaryMinus.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oUnaryMinus.out 2>&1 | %filecheck %s
 // RUN: ./UnaryMinus.out | %filecheck_exec %s
-// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oUnaryMinus.out
+// RUN: %cladclang %s -I%S/../../include -oUnaryMinus.out
 // RUN: ./UnaryMinus.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/UserDefinedTypes.C b/test/Gradient/UserDefinedTypes.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oUserDefinedTypes.out -Xclang -verify 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -oUserDefinedTypes.out -Xclang -verify 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: %cladclang %s -I%S/../../include -oUserDefinedTypes.out
 // RUN: ./UserDefinedTypes.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Gradient/constexprTest.C b/test/Gradient/constexprTest.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oconstexprTest.out | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oconstexprTest.out
 // RUN: ./constexprTest.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Hessian/ArrayErrors.C b/test/Hessian/ArrayErrors.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1
 
 #include "clad/Differentiator/Differentiator.h"
 

diff --git a/test/Hessian/Arrays.C b/test/Hessian/Arrays.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oArrays.out
 // RUN: ./Arrays.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/Hessian/BuiltinDerivatives.C b/test/Hessian/BuiltinDerivatives.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oHessianBuiltinDerivatives.out
 // RUN: ./HessianBuiltinDerivatives.out | %filecheck_exec %s
 
 

diff --git a/test/Hessian/Functors.C b/test/Hessian/Functors.C
@@ -1,6 +1,6 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -disable-tbr %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: %cladclang %s -I%S/../../include -oFunctors.out
 // RUN: ./Functors.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"