Skip to content

Commit e4416ea

Browse files
committed
Fix cppruntime tests
1 parent 3e5635a commit e4416ea

7 files changed

+14
-15
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
runScript(getEnvironmentVar("OMLIBRARYCOMMON")+"/ModelTestingDefaults.mos");
22
simulationRuntime := OpenModelicaModelTesting.SimulationRuntime.Cpp;
3+
setCXXCompiler("g++");

openmodelica/cppruntime/libraries/msl32/Modelica.Electrical.Analog.Examples.CauerLowPassSC.mos

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ runScript(modelTesting);getErrorString();
3939
// "\"true
4040
// \"
4141
// OpenModelicaModelTesting.SimulationRuntime.Cpp
42+
// true
4243
// "
4344
// ""
4445
// OpenModelicaModelTesting.SimulationRuntime.Cpp

openmodelica/cppruntime/libraries/msl32/Modelica.Electrical.Digital.Examples.Counter.mos

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ runScript(modelTesting);getErrorString();
2020
// "\"true
2121
// \"
2222
// OpenModelicaModelTesting.SimulationRuntime.Cpp
23+
// true
2324
// "
2425
// ""
2526
// OpenModelicaModelTesting.SimulationRuntime.Cpp

openmodelica/cppruntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum.mos

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ getErrorString();
2020
// "\"true
2121
// \"
2222
// OpenModelicaModelTesting.SimulationRuntime.Cpp
23+
// true
2324
// "
2425
// OpenModelicaModelTesting.Kind.VerifiedSimulation
2526
// Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum

openmodelica/cppruntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody.mos

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@ getErrorString();
1717

1818

1919
// Result:
20-
// true
21-
// true
20+
// "\"true
21+
// \"
2222
// OpenModelicaModelTesting.SimulationRuntime.Cpp
23+
// true
24+
// "
2325
// OpenModelicaModelTesting.Kind.VerifiedSimulation
2426
// Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody
25-
// "../../../../simulation/libraries/msl32/ReferenceFiles/Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody.mat"
26-
// 0.0
27-
// 0.01
28-
// 0.0001
29-
// "mat"
3027
// {"body.v_0[1]","body.v_0[2]","body.v_0[3]","body.body.frame_a.r_0[1]","body.body.frame_a.r_0[2]","body.body.frame_a.r_0[3]","body.body.w_a[1]","body.body.w_a[2]","body.body.w_a[3]"}
3128
// Simulation options: startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
3229
// Result file: Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody_res.mat

openmodelica/cppruntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mos

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,15 @@ getErrorString();
1717

1818

1919
// Result:
20-
// true
21-
// true
20+
// "\"true
21+
// \"
2222
// OpenModelicaModelTesting.SimulationRuntime.Cpp
23+
// true
24+
// "
2325
// OpenModelicaModelTesting.Kind.VerifiedSimulation
2426
// Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving
25-
// "../../../../simulation/libraries/msl32/ReferenceFiles/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mat"
26-
// 0.0
27-
// 0.01
28-
// 0.0001
29-
// "mat"
3027
// {"wheelSet.x","wheelSet.y","wheelSet.phi","wheelSet.theta1","wheelSet.theta2","wheelSet.der_theta1","wheelSet.der_theta2"}
31-
// Simulation options: startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 0.000001, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
28+
// Simulation options: startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
3229
// Result file: Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving_res.mat
3330
// Files Equal!
3431
// "true

openmodelica/cppruntime/libraries/msl32/Modelica.Mechanics.Translational.Examples.InitialConditions.mos

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ runScript(modelTesting);getErrorString();
3838
// "\"true
3939
// \"
4040
// OpenModelicaModelTesting.SimulationRuntime.Cpp
41+
// true
4142
// "
4243
// ""
4344
// OpenModelicaModelTesting.Kind.VerifiedSimulation

0 commit comments

Comments
 (0)