* tests/regression/Makefile.am (JAVACCMD): Added -source 1.5 -target

1.5 -nowarn.
(SOURCE_FILES): Removed HelloWorld.java.
(SIMPLE_JAVA_TESTS): Removed.
(run): Target added.
* tests/regression/HelloWorld.java: Removed.

diff --git a/tests/regression/HelloWorld.java b/tests/regression/HelloWorld.java
deleted file mode 100644 (file)
index ab1fd58..0000000
--- a/tests/regression/HelloWorld.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class HelloWorld {
-    public static void main(String[] argv) {
-        System.out.println("OK");
-    }
-}

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 02addaa9ee75287a0bfeca66322513c47500fd34..1481cac0bbb04c5f1a577c87fb544c79a10d9cd2 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -31,10 +31,9 @@ SUBDIRS = \
 
 JAVA     = $(top_builddir)/src/cacao/cacao
 JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -source 1.5 -target 1.5 -nowarn -bootclasspath $(BOOTCLASSPATH)
 
 SOURCE_FILES = \
-       $(srcdir)/HelloWorld.java \
        $(srcdir)/jctest.java \
        $(srcdir)/fptest.java \
        $(srcdir)/fp.java \
@@ -63,9 +62,6 @@ CLEANFILES = \
        *.class \
        *.thisoutput
 
-SIMPLE_JAVA_TESTS = \
-       HelloWorld
-
 OUTPUT_JAVA_TESTS = \
        jctest \
        fptest \
@@ -78,14 +74,12 @@ OUTPUT_JAVA_TESTS = \
        MinimalClassReflection \
        TestAnnotations
 
-check: build $(SIMPLE_JAVA_TESTS) $(OUTPUT_JAVA_TESTS)
+check: build run
 
 build:
        $(JAVACCMD) -d . $(SOURCE_FILES)
 
-$(SIMPLE_JAVA_TESTS):
-       @echo "$@: "
-       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $@
+run: $(OUTPUT_JAVA_TESTS)
 
 $(OUTPUT_JAVA_TESTS):
        @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(SHELL) $(srcdir)/Test.sh "$(JAVACMD)" $@ $(srcdir)