Skip to content

Commit 2ab77cd

Browse files
authored
revert the testing with MSL4.1.0 changes (#210)
1 parent 7053300 commit 2ab77cd

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

.CI/installLibraries.mos

+6-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// usually the newest version will be loaded instead if you remove them!
33
// SO: first remove them from configs/conf* then remove them from here.
44
updatePackageIndex();
5+
if not installPackage(Modelica, "3.1.0", exactMatch=true) then
6+
print("Modelica 3.1.0 " + getErrorString() + "\n");
7+
exit(1);
8+
end if;
59
if not installPackage(Modelica, "4.1.0-beta.om", exactMatch=true) then
610
print("Modelica 4.1.0-beta.om" + getErrorString() + "\n");
711
exit(1);
@@ -10,17 +14,13 @@ if not installPackage(ModelicaServices, "4.1.0-beta.om", exactMatch=true) then
1014
print("ModelicaServices 4.1.0-beta.om" + getErrorString() + "\n");
1115
exit(1);
1216
end if;
13-
if not installPackage(ModelicaServices, "trunk", exactMatch=true) then
14-
print("ModelicaServices trunk" + getErrorString() + "\n");
15-
exit(1);
16-
end if;
17-
for v in {"3.2.3","4.1.0-beta.om"} loop
17+
for v in {"3.2.1","3.2.2","3.2.3","4.0.0","4.1.0-beta.om","trunk"} loop
1818
if not installPackage(ModelicaTest, v, exactMatch=true) then
1919
print("ModelicaTest " + v + " " + getErrorString() + "\n");
2020
exit(1);
2121
end if;
2222
end for;
23-
for v in {"maint.11.x", "maint.12.x", "master"} loop
23+
for v in {"1.6", "3.0.0", "maint.7.0.x", "maint.8.1.x", "maint.9.1.x", "maint.10.0.x", "maint.11.x", "maint.12.x", "master"} loop
2424
if not installPackage(Buildings, v) then
2525
print("Buildings " + v + " " + getErrorString() + "\n");
2626
exit(1);
@@ -90,11 +90,9 @@ end for;
9090

9191
print("Did install:" + getErrorString() + "\n");
9292

93-
/* do not upgrade as it will reinstall libs!
9493
if not upgradeInstalledPackages() then
9594
print("Failed upgrade:\n" + getErrorString() + "\n");
9695
exit(1);
9796
end if;
9897

9998
print("Did upgrade:\n" + getErrorString() + "\n");
100-
*/

configs/conf.json

+20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
[
2+
{
3+
"library":"Modelica",
4+
"libraryVersion":"trunk",
5+
"referenceFileExtension":"csv",
6+
"referenceFileNameDelimiter":"/",
7+
"referenceFileNameExtraName":"$ClassName",
8+
"referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.1.0",
9+
"extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
10+
"optlevel":"-Os -march=native"
11+
},
212
{
313
"library":"Modelica",
414
"libraryVersion":"4.1.0-beta.om",
@@ -9,6 +19,16 @@
919
"extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
1020
"optlevel":"-Os -march=native"
1121
},
22+
{
23+
"library":"Modelica",
24+
"libraryVersion":"4.0.0",
25+
"referenceFileExtension":"csv",
26+
"referenceFileNameDelimiter":"/",
27+
"referenceFileNameExtraName":"$ClassName",
28+
"allReferenceFilesExist":false,
29+
"referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.0.0",
30+
"optlevel":"-Os -march=native"
31+
},
1232
{
1333
"library":"Modelica",
1434
"libraryVersion":"3.2.3",

0 commit comments

Comments
 (0)