expected output for cpp tests

OpenModelica · Aug 25, 2015 · 7203fe6 · 7203fe6
1 parent b0af03a
commit 7203fe6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 29 deletions.
diff --git a/simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.Multiplexer.mos b/simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.Multiplexer.mos
@@ -28,24 +28,11 @@ runScript("common.mos");getErrorString();
 runScript(modelTesting);getErrorString();
 
 // Result:
-// "true
-// "
-// ""
-// OpenModelicaModelTesting.Kind.VerifiedSimulation
-// Modelica.Electrical.Digital.Examples.Multiplexer
-// {"D0.y","D1.y","D2.y","D3.y","CLK.y","Enable.y","FF.q","FF.qn","MUX.d",""}
-// "OpenModelicaModelTesting.SimulationRuntime.Cpp
-// "
-// ""
-// Simulation options: startTime = 0.0, stopTime = 250.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Digital.Examples.Multiplexer', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
-// Result file: Modelica.Electrical.Digital.Examples.Multiplexer_res.mat
-// Failed variables: MUX.dFF.qnFF.q
-// Error: Could not read variable  in file Modelica.Electrical.Digital.Examples.Multiplexer.mat.
-// Warning: Get data of variable  from file Modelica.Electrical.Digital.Examples.Multiplexer.mat failed!
-// Warning: Files not Equal
-// Failed variables: MUX.dFF.qnFF.q
-// Error: Could not read variable  in file Modelica.Electrical.Digital.Examples.Multiplexer_res.mat.
-// Created diff file Modelica.Electrical.Digital.Examples.Multiplexer.FF.qn.html
-// Created diff file Modelica.Electrical.Digital.Examples.Multiplexer.FF.q.html
-// This test cannot succeed automated testing because the test kind is wrong
+// Error processing file: Modelica.Electrical.Digital.Examples.Multiplexer.mos
+// [simulation/libraries/msl32_cpp/Modelica.Electrical.Digital.Examples.Multiplexer.mos:24:2-24:2:writable] Error: Parser error: LA(2) == EQUALS near: } (RBRACE)
+// 
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+// 
+// Execution failed!
 // endResult
diff --git a/...ion/libraries/msl32_cpp/Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling.mos b/...ion/libraries/msl32_cpp/Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling.mos
@@ -8,7 +8,7 @@
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
-modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
+modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling);
 compareVars :=
 {
@@ -29,7 +29,7 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// OpenModelicaModelTesting.Kind.SimpleSimulation
+// OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Cooling
 // {"dcpm.la.i","loadInertia.phi","loadInertia.w","cooling.T","armature.T","core.T","volumeFlow.T"}
 // "OpenModelicaModelTesting.SimulationRuntime.Cpp

diff --git a/...ibraries/msl32_cpp/Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse.mos b/...ibraries/msl32_cpp/Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse.mos
@@ -35,7 +35,5 @@ runScript(modelTesting);getErrorString();
 // ""
 // Simulation options: startTime = 0.0, stopTime = 0.1, numberOfIntervals = 1000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
 // Result file: Modelica.Electrical.Machines.Examples.Transformers.Rectifier6pulse_res.mat
-// "true
-// "
-// ""
+// Note: Result files are now equal. Please update the test to do verified simulation!
 // endResult
diff --git a/simulation/libraries/msl32_cpp/Modelica.Math.Nonlinear.Examples.quadratureLobatto3.mos b/simulation/libraries/msl32_cpp/Modelica.Math.Nonlinear.Examples.quadratureLobatto3.mos
@@ -8,7 +8,7 @@
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
-modelTestingType := OpenModelicaModelTesting.Kind.Instantiation;
+modelTestingType := OpenModelicaModelTesting.Kind.Compilation;
 modelName := $TypeName(Modelica.Math.Nonlinear.Examples.quadratureLobatto3);
 compareVars :=
 {
@@ -24,12 +24,14 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// OpenModelicaModelTesting.Kind.Instantiation
+// OpenModelicaModelTesting.Kind.Compilation
 // Modelica.Math.Nonlinear.Examples.quadratureLobatto3
 // {"q","qd"}
 // "OpenModelicaModelTesting.SimulationRuntime.Cpp
 // "
 // ""
-// Frontend succeeded
-// The model now translates (generates code). Please update the test.
+// Compilation succeeded
+// "true
+// "
+// ""
 // endResult
diff --git a/simulation/libraries/msl32_cpp/Modelica.Mechanics.Rotational.Examples.Friction.mos b/simulation/libraries/msl32_cpp/Modelica.Mechanics.Rotational.Examples.Friction.mos
@@ -42,4 +42,10 @@ runScript(modelTesting);getErrorString();
 // ""
 // Simulation options: startTime = 0.0, stopTime = 3.0, numberOfIntervals = 3000, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'Modelica.Mechanics.Rotational.Examples.Friction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''
 // Result file: Modelica.Mechanics.Rotational.Examples.Friction_res.mat
+// Files Equal!
+// Warning: There are iteration variables with default zero start attribute. Use +d=initialization for more information.
+// 
+// "true
+// "
+// ""
 // endResult