From f7f18de2825917bb8248a6ba878f5fffed3b9a8f Mon Sep 17 00:00:00 2001 From: Niklas Worschech Date: Fri, 27 Jul 2012 07:58:45 +0000 Subject: [PATCH] -changed simcall in CevalScript for cpp runtime git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12365 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- Compiler/Script/CevalScript.mo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo index 618c68a9010..2d96b4abbeb 100644 --- a/Compiler/Script/CevalScript.mo +++ b/Compiler/Script/CevalScript.mo @@ -1341,11 +1341,11 @@ algorithm ifcpp=Util.equal(Config.simCodeTarget(),"Cpp"); compileDir=Util.if_(ifcpp,Settings.getInstallationDirectoryPath() +& "/bin/" ,compileDir); result_file = stringAppendList(List.consOnTrue(not Config.getRunningTestsuite(),compileDir,{executable,"_res.",outputFormat_str})); - simflags2=Util.if_(ifcpp,stringAppendList({compileDir," ","./"," ",result_file}),""); + simflags2=Util.if_(ifcpp,stringAppendList({compileDir," ","./"," ",result_file}), simflags); executable1=Util.if_(ifcpp,"Simulation",executable); executableSuffixedExe = stringAppend(executable1, System.getExeExt()); // sim_call = stringAppendList({"sh -c ",cit,"ulimit -t 60; ",cit,pwd,pd,executableSuffixedExe,cit," > output.log 2>&1",cit}); - sim_call = stringAppendList({cit,compileDir,executableSuffixedExe,cit," ",simflags," ",simflags2," > output.log 2>&1"}); + sim_call = stringAppendList({cit,compileDir,executableSuffixedExe,cit," ",simflags2," > output.log 2>&1"}); System.realtimeTick(RT_CLOCK_SIMULATE_SIMULATION); SimulationResults.close() "Windows cannot handle reading and writing to the same file from different processes like any real OS :("; 0 = System.systemCall(sim_call);