* configure.ac: Generate tests/regression/jasmin/Makefile.

* tests/regression/Makefile.am: Added subdir jasmin.

* tests/regression/jasmin/Makefile.am: New file.

* tests/regression/jasmin/runtest: Check if jasmin .jar is available.

--HG--
branch : unified_variables

diff --git a/configure.ac b/configure.ac
index 9d1b56af85aa07e4ff0f75d59e1a736b64f42c6d..721b6128d7d9569056684f5a35af1ff231b41443 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -878,6 +878,7 @@ AC_CONFIG_FILES([Makefile]
                [tests/Makefile]
                [tests/regression/Makefile]
                [tests/regression/codepatching/Makefile]
+               [tests/regression/jasmin/Makefile]
                [tests/regression/native/Makefile])
 
 

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index e2bbd45db395556001b5ae9da1d483c9e79a2e37..7c92cd020068b8d1a31946cdb1e1811cbcc5a342 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -28,12 +28,13 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 5404 2006-09-07 13:29:05Z christian $
+## $Id: Makefile.am 5505 2006-09-14 22:51:12Z edwin $
 
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = \
        codepatching \
+       jasmin \
        native
 
 JAVA      = $(top_builddir)/src/cacao/cacao

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
new file mode 100644 (file)
index 0000000..2a7e47f
--- /dev/null
+++ b/tests/regression/jasmin/Makefile.am
@@ -0,0 +1,111 @@
+## 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
+##
+## 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.
+##
+## 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_in_local.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_new_in_local_within_try.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
+
+
+SOURCE_FILES = \
+       $(srcdir)/runtest \
+       $(srcdir)/show \
+       $(JASMIN_TESTS)
+
+CLEANFILES = \
+       *.class \
+       TESTLOG TESTEXPECT TESTOUT TESTERR
+
+check:
+       JAVA=$(JAVA) JAVAFLAGS=$(JAVAFLAGS) ./runtest $(JASMIN_TESTS)
+
+## Local variables:
+## mode: Makefile
+## indent-tabs-mode: t
+## c-basic-offset: 4
+## tab-width: 8
+## compile-command: "automake --add-missing"
+## End:

diff --git a/tests/regression/jasmin/runtest b/tests/regression/jasmin/runtest
index ad74c4ba277120d0e45864f45cc041e177b83672..c1c5c3f5372abf9e2891bfa8e49074447579fddb 100755 (executable)
--- a/tests/regression/jasmin/runtest
+++ b/tests/regression/jasmin/runtest
@@ -27,7 +27,16 @@ if [ "$1" = "--color" ] ; then
 fi
 
 JASMIN_JAR=/usr/share/java/jasmin-sable.jar
-JASMIN="$JAVA -cp $JASMIN_JAR jasmin.Main"
+
+if [ ! -r "$JASMIN_JAR" ] ; then
+       echo >&2 "$0: warning: jasmin .jar is not available at $JASMIN_JAR"
+       exit 0
+fi
+
+JASMIN="$JAVA $JAVAFLAGS -cp $JASMIN_JAR jasmin.Main"
+
+echo "java command: $JAVA $JAVAFLAGS"
+echo "jasmin command: $JASMIN"
 
 while [ -n "$1" ]
 do
@@ -52,7 +61,7 @@ do
 
        # run the test
 
-    $JAVA "$TESTBASENAME" >"$TESTOUT" 2>"$TESTERR"
+    $JAVA $JAVAFLAGS "$TESTBASENAME" >"$TESTOUT" 2>"$TESTERR"
        TESTSTATUS=$?
 
        if [ $TESTSTATUS -ne $EXPECTSTATUS ] ; then
@@ -73,8 +82,8 @@ do
                fi
 
                if [ "$VERBOSE" -eq "1" ] ; then
-               $JAVA -sia "$TESTBASENAME" >"$TESTLOG" || exit 2
-               ./show "$TESTLOG"
+                       $JAVA $JAVAFLAGS -sia "$TESTBASENAME" >"$TESTLOG" || exit 2
+                       ./show "$TESTLOG"
                fi
        else
                if grep "$EXPECTERROR" "$TESTERR" >/dev/null ; then