deactivate failing optimization tests (#3437)

OpenModelica · Sep 2, 2015 · edeb2cb · edeb2cb
1 parent b8ba104
commit edeb2cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/openmodelica/cruntime/optimization/benchmark/Makefile b/openmodelica/cruntime/optimization/benchmark/Makefile
@@ -2,15 +2,14 @@ TEST = ../../../../rtest -v
 
 
 TESTFILES = \
-runDrumBoiler.mos \
-runExReduceDrumBoiler.mos \
 runReduceDrumBoiler.mos
 
 
 # test that currently fail. Move up when fixed. 
 # Run make testfailing
 FAILINGTESTFILES = \
-
+runDrumBoiler.mos \
+runExReduceDrumBoiler.mos \
 
 
 # Dependency files that are not .mo .mos or Makefile
@@ -32,7 +31,7 @@ test:
 	@echo
 	@echo OPENMODELICAHOME=" $(OPENMODELICAHOME) "
 	@$(TEST) $(TESTFILES)
-	
+
 # Cleans all files that are not listed as dependencies 
 clean :
 	@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp

diff --git a/openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos b/openmodelica/cruntime/optimization/benchmark/runDrumBoiler.mos
@@ -71,7 +71,6 @@ getErrorString();
 // "
 // end SimulationResult;
 // ""
-// {"Files not Equal!","temperature.T","massFlowRate.port_b.h_outflow","evaporator.h_S","T_S","SteamValve.port_b_T"}
-// "Warning: Files not Equal
+// {"Files Equal!"}
 // "
 // endResult
diff --git a/openmodelica/cruntime/optimization/benchmark/runExReduceDrumBoiler.mos b/openmodelica/cruntime/optimization/benchmark/runExReduceDrumBoiler.mos
@@ -958,10 +958,6 @@ getErrorString();
 // LOG_IPOPT_ERROR   | info    | max violation is 2.63678e-05 for the constraint $OMC$con$Loop$9(time = 144)
 // LOG_IPOPT_ERROR   | info    | max violation is 2.63678e-05 for the constraint $OMC$con$Loop$9(time = 144)
 // LOG_IPOPT_ERROR   | info    | max violation is 3.40872e-05 for the constraint $OMC$con$Loop$9(time = 144)
-// Restoration phase is called at point that is almost feasible,
-// with constraint violation 6.263140e-11. Abort.
-// stdout | warning | No optimal solution found!
-// | | |       | Use -lv=LOG_IPOPT for more information.
 // "
 // end SimulationResult;
 // ""