* tests/regression/Makefile.am: Always use the same bootclasspath for

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

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index da35a6ea216b3ec8d9313f566a218abdae6dd18e..2221059d083538308bddfcc270393456415ffa52 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -1,9 +1,7 @@
 ## tests/regression/jasmin/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 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) 1996-2005, 2006, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,19 +19,12 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes: Edwin Steiner
-##
-## $Id$
 
-## Process this file with automake to produce Makefile.in
 
-JAVA      = $(top_builddir)/src/cacao/cacao
-JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
+JAVA          = $(top_builddir)/src/cacao/cacao
+BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES)
+JAVACMD       = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD      = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
 JASMIN_TESTS = \
        $(srcdir)/test_coalesce_simple_store.j \
@@ -53,7 +44,14 @@ JASMIN_TESTS = \
        $(srcdir)/test_load_store_conflict.j \
        $(srcdir)/test_load_store_conflict_via_dup.j \
        $(srcdir)/test_load_store_conflict_via_swap.j \
+       $(srcdir)/test_many_dup.j \
+       $(srcdir)/test_many_dup_x1.j \
+       $(srcdir)/test_many_dup_x2.j \
+       $(srcdir)/test_many_dup2.j \
+       $(srcdir)/test_many_dup2_x1.j \
+       $(srcdir)/test_many_dup2_x2.j \
        $(srcdir)/test_many_monitors.j \
+       $(srcdir)/test_many_swap.j \
        $(srcdir)/test_no_store_load_conflict.j \
        $(srcdir)/test_no_store_store_conflict.j \
        $(srcdir)/test_nullpointerexception_monitorexit.j \
@@ -75,6 +73,7 @@ JASMIN_TESTS = \
        $(srcdir)/test_verify_fail_getfield_basic_type_lookup.j \
        $(srcdir)/test_verify_fail_getfield_basic_type_value.j \
        $(srcdir)/test_verify_fail_handler_bad_local.j \
+       $(srcdir)/test_verify_fail_init_nullpointer.j \
        $(srcdir)/test_verify_fail_invoke_basic_type.j \
        $(srcdir)/test_verify_fail_invoke_return_basic_type.j \
        $(srcdir)/test_verify_fail_ireturn_wrong_type.j \
@@ -90,6 +89,8 @@ JASMIN_TESTS = \
        $(srcdir)/test_verify_fail_long_local_index.j \
        $(srcdir)/test_verify_fail_long_local.j \
        $(srcdir)/test_verify_fail_long_overwritten.j \
+       $(srcdir)/test_verify_fail_merge_different_new_objects.j \
+       $(srcdir)/test_verify_fail_merge_init_nullpointer.j \
        $(srcdir)/test_verify_fail_putfield_basic_type_instance.j \
        $(srcdir)/test_verify_fail_putfield_basic_type_lookup.j \
        $(srcdir)/test_verify_fail_putfield_basic_type_value.j \
@@ -110,6 +111,7 @@ JASMIN_TESTS = \
        $(srcdir)/test_verify_ok_jsr_subroutine_loops_to_start.j \
        $(srcdir)/test_verify_ok_jsr_swap.j \
        $(srcdir)/test_verify_ok_jsr_through_variable.j \
+       $(srcdir)/test_verify_ok_local_as_retaddr_and_reference.j \
        $(srcdir)/test_verify_ok_overwrite_local_type.j \
        $(srcdir)/test_verify_ok_untyped_local.j \
        $(srcdir)/test_verify_unspecced_ok_backward_with_new_in_local.j \
@@ -125,10 +127,10 @@ EXTRA_DIST = \
 
 CLEANFILES = \
        *.class \
-       TESTLOG TESTEXPECT TESTOUT TESTERR
+       TESTLOG TESTEXPECT TESTOUT TESTERR TESTSIA
 
 check:
-       JAVA="$(JAVA)" JAVAFLAGS="$(JAVAFLAGS)" $(srcdir)/runtest $(JASMIN_TESTS)
+       @LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs JAVA="$(JAVACMD)" $(srcdir)/runtest $(JASMIN_TESTS)
 
 ## Local variables:
 ## mode: Makefile