Skip to content

Commit 30f812e

Browse files
committed
- Do not run readRealParameterModel in the recursive test
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12827 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent f10aa1e commit 30f812e

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

Examples/BuildModelRecursive.mos

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ system("rm -f tmp.date");
1515

1616
if MSLVersion == "3.2" then
1717
loadModel(ModelicaTest,{"1.1"});
18-
loadModelicaTest:="\nloadModel(ModelicaTest,{\"1.1\"});";
18+
loadModel(ObsoleteModelica3,{"3.2.1"});
19+
loadModelicaTest:="\nloadModel(ModelicaTest,{\"1.1\"});\nloadModel(ObsoleteModelica3,{\"3.2.1\"});";
1920
else
2021
loadModelicaTest:="";
2122
end if;
@@ -34,16 +35,7 @@ deleteClass(Modelica.Utilities);
3435
system("rm -f Modelica");
3536
system("ln -fs '"+getInstallationDirectoryPath()+"/lib/omlibrary/Modelica "+MSLVersion+"/' Modelica");
3637
omc:=getInstallationDirectoryPath()+"/bin/omc";
37-
loadString("
38-
function subScript
39-
input String strs[:];
40-
input Integer ix;
41-
output String str;
42-
algorithm
43-
str := if size(strs,1)<ix then \"\" else strs[ix];
44-
end subScript;
45-
");
46-
a:={typeNameString(x) for x guard isExperiment(x) in getClassNames(recursive=true,sort=true)};
38+
a:={typeNameString(x) for x guard isExperiment(x) and typeNameString(x)<>"Modelica.Utilities.Examples.readRealParameterModel" in getClassNames(recursive=true,sort=true)};
4739
getErrorString();
4840

4941
// writeFile("x",sum(s + "\n" for s in a));

0 commit comments

Comments
 (0)