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 6d6dbf07dca4db99323ed752623fa140ec04a824..34bcb1fd14e0e33ff3e76df37d1433d8c10374cc 100644 (file)
--- a/tests/regression/resolving/Makefile.am
+++ b/tests/regression/resolving/Makefile.am
@@ -1,23 +1,52 @@
+## tests/regression/resolving/Makefile.am
+##
+## Copyright (C) 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+##
+## This file is part of CACAO.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License as
+## published by the Free Software Foundation; either version 2, or (at
+## your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
+
 SUBDIRS = \
-    classes1 \
+       classes1 \
        classes2 \
        classes3
 
+JAVA     = $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+
 HARNESS_SOURCE_FILES = \
-       TestController.java \
-       TestLoader.java
+       $(srcdir)/TestController.java \
+       $(srcdir)/TestLoader.java
 
 HARNESS_CLASS_FILES = \
        TestController.class \
        TestLoader.class
 
 TEST_SOURCE_FILES = \
-       test_instance_subtype_violated.java \
-       test_param_loading_constraint_violated_derived.java \
-       test_param_loading_constraint_violated.java \
-       test_param_subtype_violated.java \
-       test_retval_loading_constraint_violated.java \
-       test_simple_lazy_load.java
+       $(srcdir)/test_instance_subtype_violated.java \
+       $(srcdir)/test_param_loading_constraint_violated_derived.java \
+       $(srcdir)/test_param_loading_constraint_violated.java \
+       $(srcdir)/test_param_subtype_violated.java \
+       $(srcdir)/test_retval_loading_constraint_violated.java \
+       $(srcdir)/test_return_subtype_ok.java \
+       $(srcdir)/test_return_subtype_violated.java \
+       $(srcdir)/test_simple_lazy_load.java
 
 TEST_NAMES = \
        test_instance_subtype_violated \
@@ -25,6 +54,8 @@ TEST_NAMES = \
        test_param_loading_constraint_violated \
        test_param_subtype_violated \
        test_retval_loading_constraint_violated \
+       test_return_subtype_ok \
+       test_return_subtype_violated \
        test_simple_lazy_load
 
 EXTRA_DIST = $(HARNESS_SOURCE_FILES) $(TEST_SOURCE_FILES)
@@ -32,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) $$t.java && $(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) $(HARNESS_SOURCE_FILES)
-
+       $(JAVACCMD) -d . $(HARNESS_SOURCE_FILES)