Fix testing of the Java interface

Added junit to 3rdParty and updated the paths
OpenModelica · May 7, 2015 · cb69a5a · cb69a5a
1 parent cbc725d
commit cb69a5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/3rdParty b/3rdParty
diff --git a/SimulationRuntime/c/util/java_interface/Makefile.common b/SimulationRuntime/c/util/java_interface/Makefile.common
@@ -11,7 +11,7 @@ endif
 antlr = $(top_builddir)/3rdParty/antlr/3.2/tool/antlr-3.2.jar
 antlr_depends = $(top_builddir)/3rdParty/antlr/3.2/tool/antlr-2.7.7.jar
 licenses = antlr_license.txt
-junit = junit-4.6.jar
+junit = $(top_builddir)/3rdParty/junit-4.6.jar
 
 grammars = src/org/openmodelica/corba/parser/OMCorbaDefinitions.g
 

diff --git a/SimulationRuntime/c/util/java_interface/Makefile.in b/SimulationRuntime/c/util/java_interface/Makefile.in
@@ -11,7 +11,7 @@ modelica_java.jar: $(java_sources)
 test: $(java_sources)
 	rm -rf bin-test; mkdir bin-test
 	@"$(JAVAC)" -source 5 -cp "$(antlr):$(junit)" -d bin-test $(java_sources) $(java_tests)
-	OPENMODELICAHOME=$(OPENMODELICAHOME) $(JAVA) -cp "bin-test:src:$(antlr):$(junit)" org.junit.runner.JUnitCore $(junit_tests)
+	OPENMODELICAHOME="@OMBUILDDIR@" $(JAVA) -cp "bin-test:src:$(antlr):$(junit)" org.junit.runner.JUnitCore $(junit_tests)
 
 Makefile: Makefile.in
 	(cd @top_builddir@; ./config.status)