Update testcases for new Docker image

OpenModelica · Mar 10, 2023 · 7ecf7e4 · 7ecf7e4
1 parent 5590496
commit 7ecf7e4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/.CI/cache-xenial/Dockerfile b/.CI/cache-xenial/Dockerfile
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -363,7 +363,7 @@ pipeline {
           agent {
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-xenial'
+              dir '.CI/cache'
               label 'linux'
               args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
                    "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
@@ -391,7 +391,7 @@ pipeline {
           agent {
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-xenial'
+              dir '.CI/cache'
               label 'linux'
               args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
                    "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +
@@ -419,7 +419,7 @@ pipeline {
           agent {
             dockerfile {
               additionalBuildArgs '--pull'
-              dir '.CI/cache-xenial'
+              dir '.CI/cache'
               label 'linux'
               args "--mount type=volume,source=runtest-gcc-cache,target=/cache/runtest " +
                    "--mount type=volume,source=omlibrary-cache,target=/cache/omlibrary " +

diff --git a/testsuite/openmodelica/cruntime/optimization/basic/testAlgLoop7.mos b/testsuite/openmodelica/cruntime/optimization/basic/testAlgLoop7.mos
@@ -63,8 +63,8 @@ getErrorString();
 // LOG_IPOPT_ERROR   | info    | max violation is 1.86591e-05 for the constraint $EqCon$x2(time = 0.17)
 // LOG_IPOPT_ERROR   | info    | max violation is 5.33147e-06 for the constraint $EqCon$x1(time = 0.435)
 // LOG_IPOPT_ERROR   | info    | max violation is 4.28799e-08 for the constraint $EqCon$x1(time = 0.435)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.87085e-11 for the constraint $EqCon$x1(time = 0.445)
-// LOG_IPOPT_ERROR   | info    | max violation is 4.44089e-16 for the constraint $EqCon$x1(time = 0.28)
+// LOG_IPOPT_ERROR | info    | max violation is 1.87084e-11 for the constraint $EqCon$x1(time = 0.445)
+// LOG_IPOPT_ERROR | info    | max violation is 7.21645e-16 for the constraint $EqCon$x1(time = 0.165)
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "
 // end SimulationResult;

diff --git a/testsuite/openmodelica/cruntime/optimization/basic/testDerInput.mos b/testsuite/openmodelica/cruntime/optimization/basic/testDerInput.mos
@@ -56,11 +56,11 @@ val(cost,1.0);
 // LOG_IPOPT_ERROR   | info    | max error is 0.00499703 for the approximation of the state x1(time = 3.2)
 // LOG_IPOPT_ERROR   | info    | max error is 2.88615e-16 for the approximation of the state x1(time = 2.2)
 // LOG_IPOPT_ERROR   | info    | max error is 4.88541e-16 for the approximation of the state x1(time = 2.8)
-// LOG_IPOPT_ERROR   | info    | max error is 3.77519e-16 for the approximation of the state x1(time = 2.3)
-// LOG_IPOPT_ERROR   | info    | max error is 3.99637e-16 for the approximation of the state x1(time = 4.5)
-// LOG_IPOPT_ERROR   | info    | max error is 5.27356e-16 for the approximation of the state x1(time = 3.4)
-// LOG_IPOPT_ERROR   | info    | max error is 5.27356e-16 for the approximation of the state x1(time = 3.1)
-// LOG_IPOPT_ERROR   | info    | max error is 4.10696e-16 for the approximation of the state x1(time = 2.9)
+// LOG_IPOPT_ERROR | info    | max error is 3.55185e-16 for the approximation of the state x1(time = 2.3)
+// LOG_IPOPT_ERROR | info    | max error is 2.66497e-16 for the approximation of the state x1(time = 2.4)
+// LOG_IPOPT_ERROR | info    | max error is 3.99637e-16 for the approximation of the state x1(time = 2.7)
+// LOG_IPOPT_ERROR | info    | max error is 4.21971e-16 for the approximation of the state x1(time = 3.4)
+// LOG_IPOPT_ERROR | info    | max error is 5.57714e-16 for the approximation of the state x1(time = 3.1)
 // LOG_IPOPT_ERROR   | info    | max error is 5.52509e-16 for the approximation of the state x1(time = 3.1)
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "

diff --git a/testsuite/openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos b/testsuite/openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos
@@ -74,7 +74,7 @@ getErrorString();
 // LOG_IPOPT_ERROR   | info    | max violation is 1.49979e-06 for the constraint $con$conSigma.con(time = 216)
 // LOG_IPOPT_ERROR   | info    | max violation is 1.49983e-06 for the constraint $con$conSigma.con(time = 216)
 // LOG_IPOPT_ERROR   | info    | max violation is 1.5e-06 for the constraint $con$conSigma.con(time = 360)
-// LOG_IPOPT_ERROR   | info    | max violation is 1.5e-06 for the constraint $con$conSigma.con(time = 360)
+// LOG_IPOPT_ERROR   | info    | max violation is 1.5e-06 for the constraint $con$conSigma.con(time = 288)
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 // "
 // end SimulationResult;

diff --git a/...lation/libraries/msl32/Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed.mos b/...lation/libraries/msl32/Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed.mos
@@ -9,7 +9,7 @@
 
 runScript("../common/ModelTestingDefaults.mos"); getErrorString();
 
-modelTestingType := OpenModelicaModelTesting.Kind.SimpleSimulation;
+modelTestingType := OpenModelicaModelTesting.Kind.VerifiedSimulation;
 modelName := $TypeName(Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed);
 compareVars :=
 {
@@ -28,14 +28,15 @@ runScript(modelTesting);getErrorString();
 // "true
 // "
 // ""
-// OpenModelicaModelTesting.Kind.SimpleSimulation
+// OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed
 // {"opAmp.v_in","opAmp.q_fr1","opAmp.q_fr2","opAmp.q_fr3","opAmp.q_fp1","opAmp.v_source","opAmp.x"}
 // Simulation options: startTime = 0.0, stopTime = 0.003, numberOfIntervals = 2500, tolerance = 2e-07, method = 'dassl', fileNamePrefix = 'Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed', options = '', outputFormat = 'mat', variableFilter = 'time|opAmp.v_in|opAmp.q_fr1|opAmp.q_fr2|opAmp.q_fr3|opAmp.q_fp1|opAmp.v_source|opAmp.x', cflags = '', simflags = ' -abortSlowSimulation -alarm=360 -emit_protected'
 // Result file: Modelica.Electrical.Analog.Examples.AmplifierWithOpAmpDetailed_res.mat
 // Messages: LOG_SUCCESS       | info    | The initialization finished successfully without homotopy method.
 // LOG_SUCCESS       | info    | The simulation finished successfully.
 //
+// Files Equal!
 // "true
 // "
 // ""