From 31ec0299b596a784dd33fd848a3e23453b003fff Mon Sep 17 00:00:00 2001
From: Christian Thalinger <twisti@complang.tuwien.ac.at>
Date: Tue, 29 Apr 2008 11:42:16 +0200
Subject: [PATCH] * 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.

---
 tests/regression/HelloWorld.java |  5 -----
 tests/regression/Makefile.am     | 12 +++---------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 tests/regression/HelloWorld.java

diff --git a/tests/regression/HelloWorld.java b/tests/regression/HelloWorld.java
deleted file mode 100644
index ab1fd58e1..000000000
--- 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 02addaa9e..1481cac0b 100644
--- 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)
-- 
2.25.1