- fixed some test with failure "unknown testcase status" by reorderin…

…g them in the makefile - removed the max counter of 5 that is part of the simulateAll-script
OpenModelica · Aug 7, 2015 · ca2d534 · ca2d534
1 parent ce91f7c
commit ca2d534
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/openmodelica/cppruntime/Makefile b/openmodelica/cppruntime/Makefile
@@ -1,10 +1,10 @@
 TEST = ../../rtest -v
 
 TESTFILES = \
+tearnonlin1.mos \
 WhenStatement1.mos \
 BouncingBall.mos \
-solveTest.mos \
-tearnonlin1.mos 
+solveTest.mos
 
 FAILINGTESTFILES= 
 

diff --git a/openmodelica/cppruntime/hpcom/Makefile b/openmodelica/cppruntime/hpcom/Makefile
@@ -1,11 +1,11 @@
 TEST = ../../../rtest -v
 
 TESTFILES = \
+Modelica.Electrical.Analog.Examples.CauerLowPassSC_levelfix_pthreads_memory.mos \
+Modelica.Electrical.Analog.Examples.CauerLowPassSC_level_omp_measureTime.mos \
 Modelica.Electrical.Spice3.Examples.CoupledInductors_level_omp.mos \
 Modelica.Electrical.Spice3.Examples.CoupledInductors_list_pthreads_spin.mos \
-Modelica.Electrical.Analog.Examples.CauerLowPassSC_levelfix_pthreads_memory.mos \
-Modelica.Thermal.HeatTransfer.Examples.Motor_mcp_omp.mos \
-Modelica.Electrical.Analog.Examples.CauerLowPassSC_level_omp_measureTime.mos
+Modelica.Thermal.HeatTransfer.Examples.Motor_mcp_omp.mos
 
 TESTFILES_ALL = $(TESTFILES_SERIAL) $(TESTFILES_LEVELFIX) $(TESTFILES_LEVEL) $(TESTFILES_METIS) $(TESTFILES_LIST) $(TESTFILES_LISTR) $(TESTFILES_TBB) $(TESTFILES_MCP)
 

diff --git a/simulation/libraries/msl32/simulateAll.sh b/simulation/libraries/msl32/simulateAll.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 OMC="${OPENMODELICAHOME}/bin/omc +locale=C +running-testsuite=dummy.out +d=hpcom +n=2"
+#OMC="${OPENMODELICAHOME}/bin/omc +locale=C +running-testsuite=dummy.out"
 echo $OMC
 COUNTER=0
 for f in *.mos; do
@@ -16,10 +17,10 @@ for f in *.mos; do
  			echo "- OK"
  		fi
  	fi
-	COUNTER=$((COUNTER+1))
-        if [ $COUNTER -gt 5 ]; then
-                break
-        fi
+	#COUNTER=$((COUNTER+1))
+        #if [ $COUNTER -gt 5 ]; then
+        #        break
+        #fi
 done
 
 python sortResults.py > results.txt
diff --git a/simulation/modelica/hpcom/Makefile b/simulation/modelica/hpcom/Makefile
@@ -7,7 +7,7 @@ SimpleResistor.mos \
 ElectricalCircuit.mos \
 MergingExample.mos \
 BouncingBall.mos \
-Modelica.Blocks.Examples.BooleanNetwork1 \
+Modelica.Blocks.Examples.BooleanNetwork1.mos \
 Modelica.Blocks.Examples.InverseModel.mos \
 Modelica.Electrical.Analog.Examples.SwitchWithArc.mos \
 Modelica.Electrical.Spice3.Examples.Graetz.mos \

diff --git a/simulation/modelica/hpcom/Modelica.Blocks.Examples.BooleanNetwork1.mos b/simulation/modelica/hpcom/Modelica.Blocks.Examples.BooleanNetwork1.mos
@@ -1,7 +1,7 @@
-// name:     Modelica.Fluid.Examples.BranchingDynamicPipes
-// keywords: simulation MSL Examples
-// status: correct
-// depends: Modelica.Fluid.Examples.BranchingDynamicPipes_eqs_prof.json
+// name:      Modelica.Blocks.Examples.BooleanNetwork1
+// keywords:  hpcom
+// status:    correct
+// depends:   Modelica.Blocks.Examples.BooleanNetwork1_eqs_prof.json
 //
 // Simulation Results
 // Modelica Standard Library