* Removed all Id tags.

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

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index c052b1bffc6a6085fcb9bb90c97e7443e1a0855c..ffbba1ce031308c45fc1dd167df300a99f665586 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -25,15 +25,16 @@
 ## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
-##
-## Changes: Edwin Steiner
-##
-## $Id$
-
+##          Edwin Steiner
 ## 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)
+
+if WITH_CLASSPATH_GNU
+JAVAFLAGS = -Xbootclasspath:$(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+else
+JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
+endif
 
 JASMIN_TESTS = \
        $(srcdir)/test_coalesce_simple_store.j \
@@ -53,7 +54,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 \
@@ -65,30 +73,55 @@ JASMIN_TESTS = \
        $(srcdir)/test_swap.j \
        $(srcdir)/test_swap_locals.j \
        $(srcdir)/test_verify_fail_aload_retaddress.j \
+       $(srcdir)/test_verify_fail_areturn_wrong_reftype.j \
+       $(srcdir)/test_verify_fail_athrow_wrong_reftype.j \
+       $(srcdir)/test_verify_fail_athrow_wrong_reftype_unresolved.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_getfield_basic_type_instance.j \
+       $(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 \
        $(srcdir)/test_verify_fail_jsr_called_with_different_stackdepths.j \
        $(srcdir)/test_verify_fail_jsr_exceptions.j \
        $(srcdir)/test_verify_fail_jsr_handler_in_sub.j \
+       $(srcdir)/test_verify_fail_jsr_merge_subroutines.j \
+       $(srcdir)/test_verify_fail_jsr_merge_subroutines_via_stack.j \
+       $(srcdir)/test_verify_fail_jsr_polymorphic_pop.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_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 \
+       $(srcdir)/test_verify_fail_putfieldconst_basic_type_instance.j \
+       $(srcdir)/test_verify_fail_putfieldconst_basic_type_value.j \
+       $(srcdir)/test_verify_fail_putstatic_basic_type_value.j \
+       $(srcdir)/test_verify_fail_putstaticconst_basic_type_value.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_improper_nesting.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_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 \
@@ -97,17 +130,17 @@ JASMIN_TESTS = \
 
 
 
-SOURCE_FILES = \
+EXTRA_DIST = \
        $(srcdir)/runtest \
        $(srcdir)/show \
        $(JASMIN_TESTS)
 
 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="$(JAVA)" JAVAFLAGS="$(JAVAFLAGS)" $(srcdir)/runtest $(JASMIN_TESTS)
 
 ## Local variables:
 ## mode: Makefile