Use g++ for boost threads

OpenModelica · May 20, 2015 · 3e5635a · 3e5635a
1 parent a4b5245
commit 3e5635a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/...odelica/cppruntime/hpcom/Modelica.Electrical.Analog.Examples.CauerLowPassSC_level_omp.mos b/...odelica/cppruntime/hpcom/Modelica.Electrical.Analog.Examples.CauerLowPassSC_level_omp.mos
@@ -33,16 +33,17 @@ compareVars :=
 
 setDebugFlags("hpcom"); getErrorString();
 setCommandLineOptions("+n=1 +hpcomScheduler=level +hpcomCode=openmp"); getErrorString();
+setCXXCompiler("g++");
 
 runScript(modelTesting);getErrorString();
 
 // Result:
-// "true
-// true
-// true
+// "\"true
+// \"
+// OpenModelicaModelTesting.SimulationRuntime.Cpp
+// \"csv\"
 // "
 // ""
-// OpenModelicaModelTesting.SimulationRuntime.Cpp
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Analog.Examples.CauerLowPassSC
 // 600
@@ -51,6 +52,7 @@ runScript(modelTesting);getErrorString();
 // ""
 // true
 // ""
+// true
 // readCalcTimesFromFile: No valid profiling-file found.
 // Warning: The costs have been estimated. Maybe Modelica.Electrical.Analog.Examples.CauerLowPassSC_eqs_prof-file is missing.
 // TaskgraphMeta valid

diff --git a/...a/cppruntime/hpcom/Modelica.Electrical.Analog.Examples.CauerLowPassSC_levelfix_memory.mos b/...a/cppruntime/hpcom/Modelica.Electrical.Analog.Examples.CauerLowPassSC_levelfix_memory.mos
@@ -33,26 +33,27 @@ compareVars :=
 
 setDebugFlags("hpcom,hpcomMemoryOpt"); getErrorString();
 setCommandLineOptions("+n=1 +hpcomCode=pthreads +hpcomScheduler=levelfix"); getErrorString();
+setCXXCompiler("g++");
 
 runScript(modelTesting);print(getErrorString());
 
 // Result:
-// "true
-// true
-// true
+// "\"true
+// \"
+// OpenModelicaModelTesting.SimulationRuntime.Cpp
+// \"csv\"
 // "
 // ""
-// OpenModelicaModelTesting.SimulationRuntime.Cpp
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Analog.Examples.CauerLowPassSC
 // 600
 // "mat"
-// "../../../simulation/libraries/msl32/ReferenceFiles/Modelica.Electrical.Analog.Examples.CauerLowPassSC.mat"
 // {"R4.Capacitor1.v","R5.Capacitor1.v","R8.Capacitor1.v","R9.Capacitor1.v","R1.Capacitor1.v","R2.Capacitor1.v","R3.Capacitor1.v","Rp1.Capacitor1.v","R7.Capacitor1.v","R10.Capacitor1.v","R11.Capacitor1.v","C3.v","C7.v","C1.v","C4.v","C8.v"}
 // true
 // ""
 // true
 // ""
+// true
 // readCalcTimesFromFile: No valid profiling-file found.
 // Warning: The costs have been estimated. Maybe Modelica.Electrical.Analog.Examples.CauerLowPassSC_eqs_prof-file is missing.
 // TaskgraphMeta valid
@@ -66,5 +67,5 @@ runScript(modelTesting);print(getErrorString());
 // Files Equal!
 // "true
 // "
-// ""
+//
 // endResult
diff --git a/openmodelica/cppruntime/hpcom/Modelica.Electrical.Spice3.Examples.CoupledInductors_level.mos b/openmodelica/cppruntime/hpcom/Modelica.Electrical.Spice3.Examples.CoupledInductors_level.mos
@@ -22,16 +22,17 @@ compareVars :=
 
 setDebugFlags("hpcom"); getErrorString();
 setCommandLineOptions("+n=4 +hpcomScheduler=level +hpcomCode=openmp"); getErrorString();
+setCXXCompiler("g++");
 
 runScript(modelTesting);getErrorString();
 
 // Result:
-// "true
-// true
-// true
+// "\"true
+// \"
+// OpenModelicaModelTesting.SimulationRuntime.Cpp
+// \"csv\"
 // "
 // ""
-// OpenModelicaModelTesting.SimulationRuntime.Cpp
 // OpenModelicaModelTesting.Kind.VerifiedSimulation
 // Modelica.Electrical.Spice3.Examples.CoupledInductors
 // 60
@@ -40,6 +41,7 @@ runScript(modelTesting);getErrorString();
 // ""
 // true
 // ""
+// true
 // readCalcTimesFromFile: No valid profiling-file found.
 // Warning: The costs have been estimated. Maybe Modelica.Electrical.Spice3.Examples.CoupledInductors_eqs_prof-file is missing.
 // TaskgraphMeta valid