From 1b6192ba91d8b47a95744cda66f41c42625125d9 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sun, 2 Feb 2014 05:06:04 +0000 Subject: [PATCH] - strange as it sounds -v affects -t in ulimit, remove -v git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18935 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- Examples/BuildModelRecursive.mos | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Examples/BuildModelRecursive.mos b/Examples/BuildModelRecursive.mos index 9cf8d52c801..a8a9993a16e 100644 --- a/Examples/BuildModelRecursive.mos +++ b/Examples/BuildModelRecursive.mos @@ -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); @@ -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); @@ -267,7 +267,6 @@ str:="

Recursive BuildModel Test

Tested Library: "+libraryString+" "+libraryVersionRevision+"

BuildModel time limit: "+ulimitOmc+"s

Simulation time limit: "+ulimitExe+"s

-

Memory limit: "+ulimitMemory+"kB

Default tolerance: "+String(default_tolerance)+"

" + customCommandsStr + "

Links are provided if getErrorString() or the simulation generates output. Green means success. Red is bad and in general signifies a failure.