Fix cppruntime tests

OpenModelica · May 20, 2015 · e4416ea · e4416ea
1 parent 3e5635a
commit e4416ea
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/openmodelica/cppruntime/libraries/msl32/ModelTestingDefaults.mos b/openmodelica/cppruntime/libraries/msl32/ModelTestingDefaults.mos
@@ -1,2 +1,3 @@
 runScript(getEnvironmentVar("OMLIBRARYCOMMON")+"/ModelTestingDefaults.mos");
 simulationRuntime := OpenModelicaModelTesting.SimulationRuntime.Cpp;
+setCXXCompiler("g++");
diff --git a/...odelica/cppruntime/libraries/msl32/Modelica.Electrical.Analog.Examples.CauerLowPassSC.mos b/...odelica/cppruntime/libraries/msl32/Modelica.Electrical.Analog.Examples.CauerLowPassSC.mos
@@ -39,6 +39,7 @@ runScript(modelTesting);getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
+// true
 // "
 // ""
 // OpenModelicaModelTesting.SimulationRuntime.Cpp

diff --git a/openmodelica/cppruntime/libraries/msl32/Modelica.Electrical.Digital.Examples.Counter.mos b/openmodelica/cppruntime/libraries/msl32/Modelica.Electrical.Digital.Examples.Counter.mos
@@ -20,6 +20,7 @@ runScript(modelTesting);getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
+// true
 // "
 // ""
 // OpenModelicaModelTesting.SimulationRuntime.Cpp

diff --git a/...ntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum.mos b/...ntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum.mos
@@ -20,6 +20,7 @@ getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
+// true
 // "
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum

diff --git a/.../cppruntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody.mos b/.../cppruntime/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody.mos
@@ -17,16 +17,13 @@ getErrorString();
 
 
 // Result:
-// true
-// true
+// "\"true
+// \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
+// true
+// "
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody
-// "../../../../simulation/libraries/msl32/ReferenceFiles/Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody.mat"
-// 0.0
-// 0.01
-// 0.0001
-// "mat"
 // {"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]"}
 // 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 = ''
 // Result file: Modelica.Mechanics.MultiBody.Examples.Elementary.FreeBody_res.mat

diff --git a/...braries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mos b/...braries/msl32/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mos
@@ -17,18 +17,15 @@ getErrorString();
 
 
 // Result:
-// true
-// true
+// "\"true
+// \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
+// true
+// "
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving
-// "../../../../simulation/libraries/msl32/ReferenceFiles/Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving.mat"
-// 0.0
-// 0.01
-// 0.0001
-// "mat"
 // {"wheelSet.x","wheelSet.y","wheelSet.phi","wheelSet.theta1","wheelSet.theta2","wheelSet.der_theta1","wheelSet.der_theta2"}
-// 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 = ''
+// 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 = ''
 // Result file: Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving_res.mat
 // Files Equal!
 // "true

diff --git a/...ppruntime/libraries/msl32/Modelica.Mechanics.Translational.Examples.InitialConditions.mos b/...ppruntime/libraries/msl32/Modelica.Mechanics.Translational.Examples.InitialConditions.mos
@@ -38,6 +38,7 @@ runScript(modelTesting);getErrorString();
 // "\"true
 // \"
 // OpenModelicaModelTesting.SimulationRuntime.Cpp
+// true
 // "
 // ""
 // OpenModelicaModelTesting.Kind.VerifiedSimulation