Skip to content

Commit

Permalink
- strange as it sounds -v affects -t in ulimit, remove -v
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18935 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Feb 2, 2014
1 parent dfb0867 commit 1b6192b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Examples/BuildModelRecursive.mos
Expand Up @@ -158,7 +158,7 @@ timeDiff := -1.0;

OpenModelica.Scripting.Internal.Time.timerTick(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED);
buildRes := res[1] <> \"\";
simRes := if not buildRes then false else 0 == system(\"ulimit -t " +ulimitExe+" -v "+ulimitMemory+" ; ./"+s+" > \"+simFile+\" 2>&1\");
simRes := if not buildRes then false else 0 == system(\"ulimit -t " +ulimitExe+" ; ./"+s+" > \"+simFile+\" 2>&1\");

system(\"sed -i '300,$ d' '\" + simFile + \"'\"); // Only keep the top 300 lines
timeSim := OpenModelica.Scripting.Internal.Time.timerTock(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED);
Expand Down Expand Up @@ -250,7 +250,7 @@ str:=if simRes then testcase(timeDiff,referenceOK,if referenceOK then \"\" else
writeFile(statFile + \".verify\", str);getErrorString();
") for s in a);
getErrorString();
results := system_parallel({"ulimit -t "+ulimitOmc+" -v "+ulimitMemory+" ; " + omc + " " + s + ".mos" for s in a});
results := system_parallel({"ulimit -t "+ulimitOmc+" ; " + omc + " " + s + ".mos" for s in a});
getErrorString();

system("rm -f " + log);
Expand All @@ -267,7 +267,6 @@ str:="<h1>Recursive BuildModel Test</h1>
<p>Tested Library: "+libraryString+" "+libraryVersionRevision+"</p>
<p>BuildModel time limit: "+ulimitOmc+"s</p>
<p>Simulation time limit: "+ulimitExe+"s</p>
<p>Memory limit: "+ulimitMemory+"kB</p>
<p>Default tolerance: "+String(default_tolerance)+"</p>"
+ customCommandsStr +
"<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>
Expand Down

0 comments on commit 1b6192b

Please sign in to comment.