* tests/regression/jasmin/Makefile.am: Use JAVACMD as in other test dirs.

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

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index 02541c74c3fb58565dc8ce3bce9b198d5cbc4c52..a7d384d385ec3bf1d4d1034ee072e771cd3ca2ac 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-2012
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,88 +19,29 @@
 ## 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)
 
-JASMIN_TESTS = \
-       $(srcdir)/test_coalesce_simple_store.j \
-       $(srcdir)/test_dup2.j \
-       $(srcdir)/test_dup2_x1.j \
-       $(srcdir)/test_dup2_x2.j \
-       $(srcdir)/test_dup.j \
-       $(srcdir)/test_dup_x1.j \
-       $(srcdir)/test_dup_x2.j \
-       $(srcdir)/test_dup_x2_to_dup_x1.j \
-       $(srcdir)/test.j \
-       $(srcdir)/test_load_store_conflict_by_exception.j \
-       $(srcdir)/test_load_store_conflict_by_exception_not_thrown.j \
-       $(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_monitors.j \
-       $(srcdir)/test_no_store_load_conflict.j \
-       $(srcdir)/test_no_store_store_conflict.j \
-       $(srcdir)/test_simple_load_store.j \
-       $(srcdir)/test_store_load_conflict.j \
-       $(srcdir)/test_store_store_conflict_2.j \
-       $(srcdir)/test_store_store_conflict.j \
-       $(srcdir)/test_swap_interface_slots.j \
-       $(srcdir)/test_swap.j \
-       $(srcdir)/test_swap_locals.j \
-       $(srcdir)/test_verify_fail_aload_retaddress.j \
-       $(srcdir)/test_verify_fail_backward_with_new_on_stack.j \
-       $(srcdir)/test_verify_fail_double_local_index.j \
-       $(srcdir)/test_verify_fail_double_overwritten.j \
-       $(srcdir)/test_verify_fail_invoke_basic_type.j \
-       $(srcdir)/test_verify_fail_jsr_exceptions.j \
-       $(srcdir)/test_verify_fail_jsr_handler_in_sub.j \
-       $(srcdir)/test_verify_fail_load_wrong_type.j \
-       $(srcdir)/test_verify_fail_load_wrong_type_within_block.j \
-       $(srcdir)/test_verify_fail_local_index.j \
-       $(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_retaddr_as_object.j \
-       $(srcdir)/test_verify_fail_ret_bad_type.j \
-       $(srcdir)/test_verify_fail_ret_uninit_var.j \
-       $(srcdir)/test_verify_fail_split_local.j \
-       $(srcdir)/test_verify_ok_jsr_handler_in_sub2.j \
-       $(srcdir)/test_verify_ok_jsr.j \
-       $(srcdir)/test_verify_ok_jsr_multiple_blocks.j \
-       $(srcdir)/test_verify_ok_jsr_pop.j \
-       $(srcdir)/test_verify_ok_jsr_push.j \
-       $(srcdir)/test_verify_ok_jsr_swap.j \
-       $(srcdir)/test_verify_ok_jsr_through_variable.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 \
-       $(srcdir)/test_verify_unspecced_ok_backward_with_new_on_stack.j \
-       $(srcdir)/test_verify_unspecced_ok_new_in_local_within_try.j
+JAVA     = LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(top_builddir)/src/cacao/cacao
+JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
 
-
-
-SOURCE_FILES = \
+EXTRA_DIST = \
        $(srcdir)/runtest \
        $(srcdir)/show \
-       $(JASMIN_TESTS)
+       $(srcdir)/*.j
 
 CLEANFILES = \
        *.class \
-       TESTLOG TESTEXPECT TESTOUT TESTERR
+       TESTLOG TESTEXPECT TESTOUT TESTERR TESTSIA
+
+check: build run
+
+build:
+       $(JAVACMD) -cp $(JASMIN_JAR) jasmin.Main $(srcdir)/*.j
+
+run:
+       JAVACMD="$(JAVACMD)" $(srcdir)/runtest $(srcdir)/*.j
 
-check:
-       JAVA=$(JAVA) JAVAFLAGS=$(JAVAFLAGS) ./runtest $(JASMIN_TESTS)
 
 ## Local variables:
 ## mode: Makefile