Skip to content

Commit 43d6be4

Browse files
committed
- Revert r16045 (flag wasn't removed yet)
- Bump libraries for coverage test git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16049 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent d307bf4 commit 43d6be4

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Compiler/FrontEnd/ModelicaBuiltin.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ For the MultiBody library this allows to avoid unnecessary small linear systems
553553
OpenModelica, <b>rooted</b>(x) always returns true.
554554
See <a href=\"https://trac.modelica.org/Modelica/ticket/95\">rooted ticket in the Modelica Trac</a> for details.
555555
</p>
556-
</html>"),version="Dymola / MSL 3");
556+
</html>"),version="Deprecated in the upcoming Modelica 3.2 rev2");
557557
end rooted;
558558

559559
function actualStream

Examples/BuildModelRecursive.mos

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,17 @@ system("rm -f "+libraryString+"* " + log);
3535
min(writeFile(s + ".mos","
3636
writeFile(\""+log+"\",\""+s+"\n\",append=true);
3737
statFile := \""+s+".stat\";
38-
writeFile(statFile,\"<tr><td bgcolor=\\\"#FF0000\\\">"+s+"</td></tr>\");getErrorString();
38+
writeFile(statFile,\"<tr><td bgcolor=\\\"#ff0000\\\">"+s+"</td></tr>\");getErrorString();
3939
"+loadModelCommand+"
4040
setCommandLineOptions(\"+d=nogen\"); setMatchingAlgorithm(\"PFPlusExt\"); setIndexReductionMethod(\"dynamicStateSelection\");
4141
res:=buildModel("+s+");
4242
greenColor := \"#00FF00\";
43+
if res[1] == \"\" then
44+
err:=getErrorString();
45+
setCommandLineOptions(\"+d=scodeInstShortcut\");
46+
res:=buildModel("+s+");
47+
greenColor := \"#FFFF00\";
48+
end if;
4349
errFile:=\""+s+".err\";
4450
simFile:=\""+s+".sim\";
4551
err:=getErrorString();
@@ -106,7 +112,7 @@ str:="<h1>Recursive BuildModel Test</h1>
106112
<p>BuildModel time limit: "+ulimitOmc+"s</p>
107113
<p>Simulation time limit: "+ulimitExe+"s</p>
108114
<p>Flags: setCommandLineOptions(\"+d=nogen\"); setMatchingAlgorithm(\"PFPlusExt\"); setIndexReductionMethod(\"dynamicStateSelection\");</p>
109-
<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>
115+
<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>
110116
";
111117
writeFile(log,"<html><head><title>BuildModel Results</title></head><body>" + str);
112118
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();

Examples/BuildModelTest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ done > "$PUB/MSL_old/history.txt"
113113
(echo "<html><head><title>Coverage trend overview</title><body>";
114114
for lib in "$@"; do
115115
SHORTNAME=`echo $lib | cut -d, -f1`
116-
rsvg-convert -o "MSL_old/$SHORTNAME-trend.png" "MSL_old/$SHORTNAME-trend.png"
116+
rsvg-convert --format=png -o "MSL_old/$SHORTNAME-trend.png" "MSL_old/$SHORTNAME-trend.svg"
117117
echo "<p><img src=\"MSL_old/$SHORTNAME-trend.svg\" /></p>"
118118
done;
119119
echo "</body></html>") > "$PUB/trend.html"

0 commit comments

Comments
 (0)