- Revert r16045 (flag wasn't removed yet)

sjoelund · sjoelund · commit 43d6be440698 · 2013-05-15T11:34:57.000Z
- Bump libraries for coverage test git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16049 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -553,7 +553,7 @@ For the MultiBody library this allows to avoid unnecessary small linear systems
 OpenModelica, <b>rooted</b>(x) always returns true.
 See <a href=\"https://trac.modelica.org/Modelica/ticket/95\">rooted ticket in the Modelica Trac</a> for details.
 </p>
-</html>"),version="Dymola / MSL 3");
+</html>"),version="Deprecated in the upcoming Modelica 3.2 rev2");
 end rooted;
 
 function actualStream
diff --git a/Examples/BuildModelRecursive.mos b/Examples/BuildModelRecursive.mos
@@ -35,11 +35,17 @@ system("rm -f "+libraryString+"* " + log);
 min(writeFile(s + ".mos","
 writeFile(\""+log+"\",\""+s+"\n\",append=true);
 statFile := \""+s+".stat\";
-writeFile(statFile,\"<tr><td bgcolor=\\\"#FF0000\\\">"+s+"</td></tr>\");getErrorString();
+writeFile(statFile,\"<tr><td bgcolor=\\\"#ff0000\\\">"+s+"</td></tr>\");getErrorString();
 "+loadModelCommand+"
 setCommandLineOptions(\"+d=nogen\"); setMatchingAlgorithm(\"PFPlusExt\"); setIndexReductionMethod(\"dynamicStateSelection\"); 
 res:=buildModel("+s+");
 greenColor := \"#00FF00\";
+if res[1] == \"\" then
+  err:=getErrorString();
+  setCommandLineOptions(\"+d=scodeInstShortcut\");
+  res:=buildModel("+s+");
+  greenColor := \"#FFFF00\";
+end if;
 errFile:=\""+s+".err\";
 simFile:=\""+s+".sim\";
 err:=getErrorString();
@@ -106,7 +112,7 @@ str:="<h1>Recursive BuildModel Test</h1>
 <p>BuildModel time limit: "+ulimitOmc+"s</p>
 <p>Simulation time limit: "+ulimitExe+"s</p>
 <p>Flags: setCommandLineOptions(\"+d=nogen\"); setMatchingAlgorithm(\"PFPlusExt\"); setIndexReductionMethod(\"dynamicStateSelection\");</p>
-<p>Links are provided if getErrorString() or the simulation generates output. <font style=\"background-color:#00FF00\">Green</font> means success. <font style=\"background-color:#FF0000\">Red</font> is bad and in general signifies a failure.</p>
+<p>Links are provided if getErrorString() or the simulation generates output. <font style=\"background-color:#00FF00\">Green</font> means success, <font style=\"background-color:#FFFF00\">yellow</font> means success if +d=scodeInstShortcut was used. <font style=\"background-color:#FF0000\">Red</font> is bad and in general signifies a failure.</p>
 ";
 writeFile(log,"<html><head><title>BuildModel Results</title></head><body>" + str);
 writeFile(log,"<table><tr><th>Model</th><th>Simulate</th><th>Total buildModel</th><th>Frontend</th><th>Backend</th><th>SimCode</th><th>Templates</th><th>Compile</th></tr>",append=true);getErrorString();
diff --git a/Examples/BuildModelTest.sh b/Examples/BuildModelTest.sh
@@ -113,7 +113,7 @@ done > "$PUB/MSL_old/history.txt"
 (echo "<html><head><title>Coverage trend overview</title><body>";
 for lib in "$@"; do
   SHORTNAME=`echo $lib | cut -d, -f1`
-  rsvg-convert -o "MSL_old/$SHORTNAME-trend.png" "MSL_old/$SHORTNAME-trend.png"
+  rsvg-convert --format=png -o "MSL_old/$SHORTNAME-trend.png" "MSL_old/$SHORTNAME-trend.svg"
   echo "<p><img src=\"MSL_old/$SHORTNAME-trend.svg\" /></p>"
 done;
 echo "</body></html>") > "$PUB/trend.html"
