Clean merge -> gc7-branch

[cacao.git] / tests / regression / assertion / Makefile.am

diff --git a/tests/regression/assertion/Makefile.am b/tests/regression/assertion/Makefile.am
index 53a218dd2f3bef327c83ce4bb9c3fcbe585d0bfe..19a3306c659685eaebd18bc3b2ab338ccc982df0 100644 (file)
--- a/tests/regression/assertion/Makefile.am
+++ b/tests/regression/assertion/Makefile.am
@@ -21,10 +21,9 @@
 ## 02110-1301, USA.
 
 
-JAVA          = $(top_builddir)/src/cacao/cacao
-BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
-JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH) -source 1.5 -target 1.5
 
 SOURCE_FILES = \
        $(srcdir)/testassertions.java \
@@ -68,10 +67,12 @@ ASSERTION_TESTS = \
        ESA_TEST1 \
        ESA_TEST2
 
-check: build $(ASSERTION_TESTS)
+check: build run
 
 build:
-       @$(JAVACCMD) -d . $(SOURCE_FILES)
+       $(JAVACCMD) -d . $(SOURCE_FILES)
+
+run: $(ASSERTION_TESTS)
 
 EA_TEST1:
        @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD) -ea" testassertions eatest1 enabled $(srcdir)