Adding flag --fmuType to test CS FMUs

Author: AnHeuermann

.CI/Jenkinsfile

@@ -190,7 +190,7 @@ pipeline {
           expression { params.cs_fmu_cvode_v1_24 }
         }
         steps {
-          runRegressiontest('maintenance/v1.24', 'v1.24-cs-fmu-cvode', '--fmiFlags=s:cvode --fmuRuntimeDepends=modelica', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
+          runRegressiontest('maintenance/v1.24', 'v1.24-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
         }
       }
       stage('v1.25 CVODE CS-FMUs with OMSimulator') {
@@ -206,7 +206,7 @@ pipeline {
           expression { params.cs_fmu_cvode_v1_25 }
         }
         steps {
-          runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', '--fmiFlags=s:cvode --fmuRuntimeDepends=modelica', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
+          runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
         }
       }
       stage('master CVODE CS-FMUs with OMSimulator') {
@@ -222,7 +222,7 @@ pipeline {
           expression { params.cs_fmu_cvode_master }
         }
         steps {
-          runRegressiontest('master', 'master-cs-fmu-cvode', '--fmiFlags=s:cvode --fmuRuntimeDepends=modelica', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
+          runRegressiontest('master', 'master-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
         }
       }
 
@@ -700,6 +700,9 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
     ${env.HOME}/saved_omc/OMSimulator/install/bin/OMSimulator --version
     """
     FMI_TESTING_FLAG="--fmi=true --fmisimulator=${env.HOME}/saved_omc/OMSimulator/install/bin/OMSimulator --default=ulimitExe=50"
+    if (name.containts('cvode')) {
+      FMI_TESTING_FLAG += "--fmuType='cs'"
+    }
   }
 
   if (name.contains('fmpy')) {

test.py

@@ -27,6 +27,7 @@
 parser.add_argument('configs', nargs='*')
 parser.add_argument('--branch', default='master')
 parser.add_argument('--fmi', default=False)
+parser.add_argument('--fmuType', default='me', help="FMU type: 'me' for Model Exchange, 'cs' for Co-Simulation.")
 parser.add_argument('--basemodelica-mtk-import', action="store_true", default=False, help='Activate Base Modelica export and test import with BaseModelica.jl / ModelingToolkit.jl.')
 parser.add_argument('--julia-sys-image', action=argparse.BooleanOptionalAction, default=True, help='Activate pre-compiling Julia system image.')
 parser.add_argument('--output', default='')
@@ -71,6 +72,7 @@
 basemodelica_mtk_import = args.basemodelica_mtk_import
 julia_sys_image = args.julia_sys_image
 allTestsFmi = args.fmi
+fmuType = args.fmuType
 ulimitMemory = args.ulimitvmem
 docker = args.docker
 addmsl = args.addmsl
@@ -620,7 +622,7 @@ def hashReferenceFiles(s):
     conf["haveFMI"] = fmiOK_C
     conf["haveFMICpp"] = fmiOK_Cpp
     conf["fmisimulator"] = fmisimulator
-    conf["fmuType"] = conf.get("fmuType", "me")
+    conf["fmuType"] = fmuType
   if (not canChangeOptLevel) and "optlevel" in conf:
     print("Deleting optlevel")
     del conf["optlevel"]