Merged with tip.

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

diff --git a/tests/regression/resolving/Makefile.am b/tests/regression/resolving/Makefile.am
index be1af9b322384739a9b47700a2615554f21068fe..34bcb1fd14e0e33ff3e76df37d1433d8c10374cc 100644 (file)
--- a/tests/regression/resolving/Makefile.am
+++ b/tests/regression/resolving/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/resolving/Makefile.am
 ##
-## Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,16 +19,17 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 7433 2007-03-02 19:42:13Z edwin $
 
-## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
        classes1 \
        classes2 \
        classes3
 
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+
 HARNESS_SOURCE_FILES = \
        $(srcdir)/TestController.java \
        $(srcdir)/TestLoader.java
@@ -64,17 +63,8 @@ EXTRA_DIST = $(HARNESS_SOURCE_FILES) $(TEST_SOURCE_FILES)
 CLEANFILES = \
        *.class
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-
-if WITH_CLASSPATH_GNU
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
-else
-JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
-endif
-
 check: $(HARNESS_CLASS_FILES)
-       @for t in $(TEST_NAMES) ; do echo "TEST $$t" ; { $(JAVAC) -d . $(srcdir)/$$t.java && LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVA) $$t ; } || exit 1 ; done
+       @for t in $(TEST_NAMES) ; do echo "TEST $$t" ; { $(JAVACCMD) -d . -classpath . $(srcdir)/$$t.java && LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(JAVACMD) $$t ; } || exit 1 ; done
 
 $(HARNESS_CLASS_FILES): $(HARNESS_SOURCE_FILES)
-       $(JAVAC) -d . $(HARNESS_SOURCE_FILES)
-
+       $(JAVACCMD) -d . $(HARNESS_SOURCE_FILES)