Changeset 13345

Timestamp:

2012-10-12T14:59:18+02:00 (12 years ago)

Author:

alash325

Message:

• Java and uncertainties directories are moved from testsuite to testsuite/openmodelica directory
• Updated Makefile for both

Location:

trunk/testsuite

Files:

• Makefile (modified) (3 diffs)
• openmodelica/java (moved) (moved from trunk/testsuite/java)
• openmodelica/java/JavaExtParseProgram.mos (modified) (1 diff)
• openmodelica/java/Makefile (modified) (3 diffs)
• openmodelica/uncertainties (moved) (moved from trunk/testsuite/uncertainties)
• openmodelica/uncertainties/Makefile (modified) (1 diff)

trunk/testsuite/Makefile

@@ -130 +130 @@
 test : slow.logs fast.logs
   @cat `ls $(FASTLOGS) $(SLOWLOGS) | sort`
-  @rm -f {flattening/modelica/asserts,flattening/modelica/algorithms-functions,flattening/modelica/arrays,flattening/modelica/others,flattening/modelica/external-functions,flattening/modelica/equations,flattening/modelica/built-in-functions,flattening/modelica/inheritances,flattening/modelica/operators,flattening/modelica/packages,flattening/modelica/declarations,flattening/modelica/enums,flattening/modelica/scoping,flattening/modelica/types,flattening/modelica/modification,flattening/modelica/connectors,flattening/modelica/blocks,flattening/modelica/streams,flattening/libraries/msl221,flattening/modelica/msl,metamodelica/meta,flattening/modelica/records,java,openmodelica/interactive-API,mosfiles-nosim}/*.{dll,so,exe};
+  @rm -f {flattening/modelica/asserts,flattening/modelica/algorithms-functions,flattening/modelica/arrays,flattening/modelica/others,flattening/modelica/external-functions,flattening/modelica/equations,flattening/modelica/built-in-functions,flattening/modelica/inheritances,flattening/modelica/operators,flattening/modelica/packages,flattening/modelica/declarations,flattening/modelica/enums,flattening/modelica/scoping,flattening/modelica/types,flattening/modelica/modification,flattening/modelica/connectors,flattening/modelica/blocks,flattening/modelica/streams,flattening/libraries/msl221,flattening/modelica/msl,metamodelica/meta,flattening/modelica/records,openmodelica/java,openmodelica/interactive-API,mosfiles-nosim}/*.{dll,so,exe};
 test-oldresult:
   @cat `ls $(FASTLOGS) $(SLOWLOGS) | sort`
@@ -139 +139 @@
 fast : omc-diff fast.logs
   @cat `ls $(FASTLOGS) | sort`
-  @rm -f {flattening/modelica/asserts,flattening/modelica/algorithms-functions,flattening/modelica/arrays,flattening/modelica/others,flattening/modelica/external-functions,flattening/modelica/equations,flattening/modelica/built-in-functions,flattening/modelica/inheritances,flattening/modelica/operators,flattening/modelica/packages,flattening/modelica/declarations,flattening/modelica/enums,flattening/modelica/scoping,flattening/modelica/types,flattening/modelica/modification,flattening/modelica/connectors,flattening/modelica/blocks,flattening/modelica/streams,flattening/modelica/msl,metamodelica/meta,flattening/modelica/records,java}/*.{dll,so,exe};
+  @rm -f {flattening/modelica/asserts,flattening/modelica/algorithms-functions,flattening/modelica/arrays,flattening/modelica/others,flattening/modelica/external-functions,flattening/modelica/equations,flattening/modelica/built-in-functions,flattening/modelica/inheritances,flattening/modelica/operators,flattening/modelica/packages,flattening/modelica/declarations,flattening/modelica/enums,flattening/modelica/scoping,flattening/modelica/types,flattening/modelica/modification,flattening/modelica/connectors,flattening/modelica/blocks,flattening/modelica/streams,flattening/modelica/msl,metamodelica/meta,flattening/modelica/records,openmodelica/java}/*.{dll,so,exe};
 simulation: omc-diff simulation.logs
   @cat `ls $(SIMULATIONLOGS) | sort` > simulation.log
@@ -295 +295 @@
   $(MAKE) -C openmodelica/modelicaML -f Makefile test > $@
   @echo $@ done
-java.log: omc-diff
-  $(MAKE) -C java -f Makefile test > $@
+openmodelicajava.log: omc-diff
+  $(MAKE) -C openmodelica/java -f Makefile test > $@
   @echo $@ done
 bootstrapping.log: omc-diff

trunk/testsuite/openmodelica/java/JavaExtParseProgram.mos

@@ -5 +5 @@
 // Test if getAstAsCorbaString works properly and parses in Java
 //
-loadFile("../mosfiles/TankPID.mo");
+loadFile("../../simulation/modelica/connectors/TankPID.mo");
 getAstAsCorbaString("TankPID.corbaString");
 clear();

trunk/testsuite/openmodelica/java/Makefile

@@ -1 @@
-TEST=../rtest -v
+TEST=../../rtest -v
 
-OPENMODELICAHOME := $(shell pwd)/../../build
+OPENMODELICAHOME := $(shell pwd)/../../../build
 TESTFILES=JavaExt.mos JavaExtArrays.mos JavaExtInteractive.mos JavaExtRecord.mos JavaExtUniontype.mos JavaExtParseProgram.mos
 SEP=$(shell test -e "`which mingw32-gcc.exe`" && echo ";" || echo ":")
@@ -40 +40 @@
 JavaExtDefs.jar: JavaExt.mo $(OMC) $(RUNTIME)
   "$(JAVA)" -classpath "$(RUNTIME)$(SEP)$(ANTLR)" org.openmodelica.corba.parser.DefinitionsCreator $@ org.openmodelica.JavaExtTest "." $<
-AbsynTest.jar: ../../Compiler/FrontEnd/Absyn.mo $(OMC) $(RUNTIME)
+AbsynTest.jar: ../../../Compiler/FrontEnd/Absyn.mo $(OMC) $(RUNTIME)
   OPENMODELICAHOME=$(OPENMODELICAHOME) "$(JAVA)" -classpath "$(RUNTIME)$(SEP)$(ANTLR)" org.openmodelica.corba.parser.DefinitionsCreator $@ org.openmodelica.AbsynTest "." $<
 JavaExt.class: JavaExt.java JavaExtDefs.jar AbsynTest.jar $(OMC) $(RUNTIME)
@@ -54 +54 @@
 # Used to test the data types we can't test in real OMC right now
 dummytest:
-  gcc -o dummy dummy_test.c -I../../build/include/ ../../build/lib/libSimulationRuntimeC.a $(LDL)
+  gcc -o dummy dummy_test.c -I../../../build/include/ ../../../build/lib/libSimulationRuntimeC.a $(LDL)
   dummy | diff -w dummy_test_expected.txt -
   rm -f dummy dummy.exe

trunk/testsuite/openmodelica/uncertainties/Makefile

@@ -1 @@
-TEST = ../rtest -v
+TEST = ../../rtest -v
 
 TESTFILES = \
 UncertaintyFlatten1.mo\
-dataReconciliation.mos\
-CantiliverBeam.mos
+dataReconciliation.mos
+
 # test that currently fail. Move up when fixed. 
 # Run make testfailing
-FAILINGTESTFILES=NONE
-
+FAILINGTESTFILES= \
+CantiliverBeam.mos
 # Dependency files that are not .mo .mos or Makefile
 # Add them here or they will be cleaned.