Use shared runtime libraries

marco-compiler · Nov 2, 2024 · 607350c · 607350c
1 parent 9d0b312
commit 607350c
Show file tree

Hide file tree

Showing 39 changed files with 39 additions and 46 deletions.
diff --git a/.jenkins/version_llvm.txt b/.jenkins/version_llvm.txt
@@ -1 +1 @@
-90c866d3a230d7e7c8a43670a79a65be39555a86
+cf00fbc451b65bc2db3fc052a5b883f074406523
diff --git a/.jenkins/version_marco_runtime.txt b/.jenkins/version_marco_runtime.txt
@@ -1 +1 @@
-ca68297be7d409fa47aca740b55b33f9cac53965
+981190bd87428fe9abff8b55d5002295c142c5f9
diff --git a/test/Simulation/euler-forward/accesses-depending-on-indices.mo b/test/Simulation/euler-forward/accesses-depending-on-indices.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=AccessesDependingOnIndices --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=AccessesDependingOnIndices --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x[1,1]","x[1,2]","x[1,3]","x[1,4]","x[2,1]","x[2,2]","x[2,3]","x[2,4]","x[3,1]","x[3,2]","x[3,3]","x[3,4]"

diff --git a/test/Simulation/euler-forward/algorithm-inside-model.mo b/test/Simulation/euler-forward/algorithm-inside-model.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=AlgorithmInsideModel --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=AlgorithmInsideModel --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x","y[1]","y[2]","y[3]"

diff --git a/test/Simulation/euler-forward/cycle-with-array-and-scalar-equations.mo b/test/Simulation/euler-forward/cycle-with-array-and-scalar-equations.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=ArrayAndScalarEquations --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=ArrayAndScalarEquations --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]","x[4]","y"

diff --git a/test/Simulation/euler-forward/cycle-with-bifurcation.mo b/test/Simulation/euler-forward/cycle-with-bifurcation.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]","x[4]","y[1]","y[2]","y[3]","y[4]","z[1]","z[2]","z[3]","z[4]"

diff --git a/test/Simulation/euler-forward/cycle-with-derivative.mo b/test/Simulation/euler-forward/cycle-with-derivative.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=CycleWithDerivative --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=CycleWithDerivative --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x","y"

diff --git a/test/Simulation/euler-forward/cycle-with-multiple-dependencies.mo b/test/Simulation/euler-forward/cycle-with-multiple-dependencies.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x","y","z"

diff --git a/test/Simulation/euler-forward/cycle-with-scalar-explicit-equations.mo b/test/Simulation/euler-forward/cycle-with-scalar-explicit-equations.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x","y","z"

diff --git a/test/Simulation/euler-forward/cycle-with-vectorized-explicit-equations.mo b/test/Simulation/euler-forward/cycle-with-vectorized-explicit-equations.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]","y[1]","y[2]","y[3]","z[1]","z[2]","z[3]"

diff --git a/test/Simulation/euler-forward/equation-with-induction-variable-in-expression.mo b/test/Simulation/euler-forward/equation-with-induction-variable-in-expression.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=InductionInExpression --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=InductionInExpression --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]"

diff --git a/test/Simulation/euler-forward/function-multiple-results.mo b/test/Simulation/euler-forward/function-multiple-results.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --precision=6 --end-time=0.2 --time-step=0.1 | FileCheck %s
 
 // CHECK: "time","x","y[1]","y[2]"

diff --git a/test/Simulation/euler-forward/function-output-should-not-affect-input.mo b/test/Simulation/euler-forward/function-output-should-not-affect-input.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=M1 --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --precision=6 --end-time=0.2 --time-step=0.1 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]","x[4]","x[5]","y[1]","y[2]","y[3]","y[4]","y[5]"

diff --git a/test/Simulation/euler-forward/inline-if.mo b/test/Simulation/euler-forward/inline-if.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=InlineIf --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=InlineIf --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/euler-forward/record-construction.mo b/test/Simulation/euler-forward/record-construction.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","z1.im","z1.re","z2.im","z2.re"

diff --git a/test/Simulation/euler-forward/record-inline-function.mo b/test/Simulation/euler-forward/record-inline-function.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","z1.im","z1.re","z2.im","z2.re","z3.im","z3.re"

diff --git a/test/Simulation/euler-forward/record-subscripts.mo b/test/Simulation/euler-forward/record-subscripts.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","a.x[1,1]","a.x[1,2]","a.x[2,1]","a.x[2,2]","a.x[3,1]","a.x[3,2]","y1[1]","y1[2]","y2[1]","y2[2]","y2[3]"

diff --git a/test/Simulation/euler-forward/simple-first-order.mo b/test/Simulation/euler-forward/simple-first-order.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=SimpleFirstOrder --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=SimpleFirstOrder --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/euler-forward/time-usage.mo b/test/Simulation/euler-forward/time-usage.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=TimeUsage --solver=euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=TimeUsage --solver=euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x","y"

diff --git a/test/Simulation/ida/array-variables-substitution.mo b/test/Simulation/ida/array-variables-substitution.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=ArrayVariablesSubstitution --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=ArrayVariablesSubstitution --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=2 | FileCheck %s
 
 // CHECK: "time","Q[1]","Q[2]","Q[3]","Q[4]","Q[5]","T[1]","T[2]","T[3]","T[4]"

diff --git a/test/Simulation/ida/cycle-with-all-implicit-equations.mo b/test/Simulation/ida/cycle-with-all-implicit-equations.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=CycleWithAllImplicitEquations --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=CycleWithAllImplicitEquations --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=0.2 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x","y"

diff --git a/test/Simulation/ida/cycle-with-implicit-equation.mo b/test/Simulation/ida/cycle-with-implicit-equation.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=CycleWithImplicitEquation --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=CycleWithImplicitEquation --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x","y"

diff --git a/test/Simulation/ida/der-function-call.mo b/test/Simulation/ida/der-function-call.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=DerFunctionCall --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=DerFunctionCall --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","w","z"

diff --git a/test/Simulation/ida/derivative-and-state-same-equation.mo b/test/Simulation/ida/derivative-and-state-same-equation.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=ArraysWithState --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=ArraysWithState --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]","y[1]","y[2]","y[3]"

diff --git a/test/Simulation/ida/equation-with-induction-in-expression.mo b/test/Simulation/ida/equation-with-induction-in-expression.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=InductionUsage --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=InductionUsage --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]","x[3]","x[4]","x[5]"

diff --git a/test/Simulation/ida/function-call.mo b/test/Simulation/ida/function-call.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=FunctionCall --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=FunctionCall --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x","y"

diff --git a/test/Simulation/ida/implicit-equation.mo b/test/Simulation/ida/implicit-equation.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=ImplicitEquation --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=ImplicitEquation --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/ida/implicit-kepler.mo b/test/Simulation/ida/implicit-kepler.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=ImplicitKepler --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=ImplicitKepler --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x[1]","x[2]"

diff --git a/test/Simulation/ida/multidimensional-array.mo b/test/Simulation/ida/multidimensional-array.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=MultidimensionalArray --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=MultidimensionalArray --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x[1,1]","x[1,2]","x[1,3]","x[2,1]","x[2,2]","x[2,3]"

diff --git a/test/Simulation/ida/no-equations-handled.mo b/test/Simulation/ida/no-equations-handled.mo
@@ -1,11 +1,11 @@
-// RUN: marco %s --omc-bypass --model=NoEquationsForIDA --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=NoEquationsForIDA --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s --check-prefix="CHECK-EQUIDISTANT"
 
 // CHECK-EQUIDISTANT: "time","x"
 // CHECK-EQUIDISTANT: 0.0000,2.0000
 // CHECK-EQUIDISTANT: 1.0000,2.0000
 
-// RUN: marco --omc-bypass --model=NoEquationsForIDA --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir %s -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=NoEquationsForIDA --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --precision=6 | FileCheck %s --check-prefix="CHECK-NO-EQUIDISTANT"
 
 // CHECK-NO-EQUIDISTANT: "time","x"

diff --git a/test/Simulation/ida/robertson.mo b/test/Simulation/ida/robertson.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Robertson --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Robertson --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=400 --time-step=1 --precision=4 | FileCheck %s
 
 // CHECK: "time","y1","y2","y3"

diff --git a/test/Simulation/ida/scalar-variables-substitution.mo b/test/Simulation/ida/scalar-variables-substitution.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=ScalarVariablesSubstitution --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=ScalarVariablesSubstitution --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x","y"

diff --git a/test/Simulation/ida/time-usage.mo b/test/Simulation/ida/time-usage.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=TimeUsage --solver=ida -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=TimeUsage --solver=ida -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=4 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/runge-kutta/euler-backward.mo b/test/Simulation/runge-kutta/euler-backward.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=rk-euler-backward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=rk-euler-backward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/runge-kutta/euler-forward.mo b/test/Simulation/runge-kutta/euler-forward.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=rk-euler-forward -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=rk-euler-forward -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/runge-kutta/heun-euler.mo b/test/Simulation/runge-kutta/heun-euler.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=rk-heun-euler -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=rk-heun-euler -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/Simulation/runge-kutta/rk4.mo b/test/Simulation/runge-kutta/rk4.mo
@@ -1,4 +1,4 @@
-// RUN: marco %s --omc-bypass --model=Test --solver=rk4 -o %basename_t -L %runtime_lib_dir -L %sundials_lib_dir -Wl,-rpath,%sundials_lib_dir -L %llvm_lib_dir -Wl,-rpath,%llvm_lib_dir
+// RUN: marco %s --omc-bypass --model=Test --solver=rk4 -o %basename_t -L %runtime_lib_dir -Wl,-rpath %runtime_lib_dir
 // RUN: ./%basename_t --end-time=1 --time-step=0.1 --precision=6 | FileCheck %s
 
 // CHECK: "time","x"

diff --git a/test/lit.cfg.py b/test/lit.cfg.py
@@ -45,16 +45,11 @@
 if config.marco_runtime_found == "1":
     config.available_features.add("runtime-library")
 
-# Set the path containing the LLVM libraries.
-config.substitutions.append(("%llvm_lib_dir", config.llvm_libs_dir))
-
 # Check if the IDA solver is enabled.
 if config.marco_runtime_ida_enabled == "ON":
     config.available_features.add("runtime-ida")
 
-# Set the path containing the SUNDIALS libraries.
-config.substitutions.append(("%sundials_lib_dir", config.marco_runtime_sundials_lib_dir))
-
+# Copy system environment.
 llvm_config.with_system_environment(["HOME", "INCLUDE", "LIB", "TMP", "TEMP"], append_path=True)
 llvm_config.use_default_substitutions()
 

diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
@@ -46,8 +46,6 @@ config.marco_libs_dir = "@MARCO_LIBS_DIR@"
 config.marco_runtime_found = "@MARCORuntime_FOUND@"
 config.marco_runtime_lib_dir = "@MARCORuntime_LIB_PATH@"
 
-config.marco_runtime_sundials_lib_dir = "@MARCORuntime_SUNDIALS_LIB_PATH@"
-
 config.marco_runtime_ida_enabled = "@MARCORuntime_IDA_ENABLE@"
 
 # Support substitution of the tools_dir with user parameters. This is
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		90c866d3a230d7e7c8a43670a79a65be39555a86
		cf00fbc451b65bc2db3fc052a5b883f074406523
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ca68297be7d409fa47aca740b55b33f9cac53965
		981190bd87428fe9abff8b55d5002295c142c5f9