Add new json field to force library version exact match - to be used for MSL (#213)

Author: adrpo

README.md

@@ -52,6 +52,8 @@ The scripts from this repository can be used to run regression tests for public,
       {
         "library":"MyModelicaLibrary",
         "libraryVersion":"main",
+        "libraryVersionExactMatch":true, // to be sure that the exact version is loaded, not the latest compatible
+        "libraryVersionLatestInPackageManager":true, // load the latest from the package manager
         "referenceFileExtension":"mat",
         "referenceFileNameDelimiter":"/",
         "referenceFileNameExtraName":"$ClassName",

configs/conf.json

@@ -11,6 +11,7 @@
   {
     "library":"Modelica",
     "libraryVersion":"4.1.0",
+    "libraryVersionExactMatch":true,
     "referenceFileExtension":"csv",
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",
@@ -20,6 +21,7 @@
   {
     "library":"Modelica",
     "libraryVersion":"4.0.0",
+    "libraryVersionExactMatch":true,
     "referenceFileExtension":"csv",
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",

shared.py

@@ -43,6 +43,7 @@ def fixData(data,abortSimulationFlag,alarmFlag,overrideDefaults,defaultCustomCom
       data["environmentTranslation"] = environmentTranslation
     data["libraryVersion"] = data.get("libraryVersion") or "default"
     data["libraryVersionLatestInPackageManager"] = data.get("libraryVersionLatestInPackageManager") or False
+    data["libraryVersionExactMatch"] = data.get("libraryVersionExactMatch") or False
     data["alarmFlag"] = data.get("alarmFlag") or (alarmFlag if data["simCodeTarget"]=="C" else "")
     data["abortSlowSimulation"] = data.get("abortSlowSimulation") or (abortSimulationFlag if data["simCodeTarget"]=="C" else "")
     if "changeHash" in data: # Force rebuilding the library due to change in the testing script

test.py

@@ -630,7 +630,14 @@ def hashReferenceFiles(s):
       versions = "{" + ",".join(['"'+v+'"' for v in availableVersions]) + "}"
     else:
       versions = '{"%s"}' % version
-    if not omc.sendExpression('loadModel(%s,%s)' % (lib,versions)):
+    
+    exactMatch=''
+    if conf["libraryVersionExactMatch"]:
+      if conf["libraryVersionLatestInPackageManager"]:
+        raise Exception("Library %s has both libraryVersionLatestInPackageManager:true and libraryVersionExactMatch:true! Make up your mind." % libName)
+      exactMatch=', requireExactVersion=true'
+      
+    if not omc.sendExpression('loadModel(%s,%s%s)' % (lib,versions,exactMatch)):
       try:
         print("Failed to load library %s %s: %s" % (library,versions,omc.sendExpression('OpenModelica.Scripting.getErrorString()')))
       except: