* configure.ac (AC_CHECK_WITH_JUNIT_JAR): Added.

* m4/junit.m4: New file.
* tests/regression/base/Makefile.am (build): Use JUNIT_JAR.
(run): Likewise.
* tests/regression/bugzilla/Makefile.am (JAVACMD): Added -source 1.5
-target 1.5 -nowarn.
(build): Use JUNIT_JAR.
(run): Likewise.

diff --git a/configure.ac b/configure.ac
index cf383e774369e5c6a5292c5a002158ce670dd342..ab08042e65b6e41eca99ed6e28ea1aaf7823ce19 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -812,6 +812,7 @@ case "${WITH_JAVA_RUNTIME_LIBRARY}" in
         ;;
 esac
 
+AC_CHECK_WITH_JUNIT_JAR
 
 AC_CHECK_HEADERS(
        [regex.h], 

diff --git a/m4/junit.m4 b/m4/junit.m4
new file mode 100644 (file)
index 0000000..a9a37a2
--- /dev/null
+++ b/m4/junit.m4
@@ -0,0 +1,34 @@
+dnl m4/junit.m4
+dnl
+dnl Copyright (C) 2008
+dnl CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
+dnl 
+dnl This file is part of CACAO.
+dnl 
+dnl This program is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU General Public License as
+dnl published by the Free Software Foundation; either version 2, or (at
+dnl your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+
+
+dnl Check location of JUnit jar file.
+
+AC_DEFUN([AC_CHECK_WITH_JUNIT_JAR],[
+AC_MSG_CHECKING(location of JUnit jar)
+AC_ARG_WITH([junit-jar],
+            [AS_HELP_STRING(--with-junit-jar=<path>,location of JUnit jar file [[default=/usr/share/java/junit.jar]])],
+            [JUNIT_JAR="${withval}"],
+            [JUNIT_JAR="/usr/share/java/junit.jar"])
+AC_MSG_RESULT(${JUNIT_JAR})
+AC_SUBST(JUNIT_JAR)
+])

diff --git a/tests/regression/base/Makefile.am b/tests/regression/base/Makefile.am
index d43942e68a9c4c87873ba709a31e69b6fee0b28a..a00fc60bddc7bd210aec4b1a5140d5765bb336b7 100644 (file)
--- a/tests/regression/base/Makefile.am
+++ b/tests/regression/base/Makefile.am
@@ -34,10 +34,10 @@ CLEANFILES = \
 check: build run
 
 build:
-       $(JAVACCMD) -classpath /usr/share/java/junit4.jar -d . $(srcdir)/*.java
+       $(JAVACCMD) -classpath $(JUNIT_JAR) -d . $(srcdir)/*.java
 
 run:
-       $(JAVACMD) -classpath /usr/share/java/junit4.jar:. org.junit.runner.JUnitCore All
+       $(JAVACMD) -classpath $(JUNIT_JAR):. org.junit.runner.JUnitCore All
 
 
 ## Local variables:

diff --git a/tests/regression/bugzilla/Makefile.am b/tests/regression/bugzilla/Makefile.am
index b22e5a2d999beb7ce95bcca490a5def153231804..f56d5df0370bb7673e7e6152f0c1f7c4d66501f8 100644 (file)
--- a/tests/regression/bugzilla/Makefile.am
+++ b/tests/regression/bugzilla/Makefile.am
@@ -23,7 +23,7 @@
 
 JAVA     = LD_LIBRARY_PATH=$(top_builddir)/src/cacao/.libs $(top_builddir)/src/cacao/cacao
 JAVACMD  = $(JAVA) -Xbootclasspath:$(BOOTCLASSPATH)
-JAVACCMD = $(JAVAC) -bootclasspath $(BOOTCLASSPATH)
+JAVACCMD = $(JAVAC) -source 1.5 -target 1.5 -nowarn -bootclasspath $(BOOTCLASSPATH)
 
 EXTRA_DIST = \
        $(srcdir)/*.java
@@ -34,10 +34,10 @@ CLEANFILES = \
 check: build run
 
 build:
-       $(JAVACCMD) -classpath /usr/share/java/junit4.jar -d . $(srcdir)/*.java
+       $(JAVACCMD) -classpath $(JUNIT_JAR) -d . $(srcdir)/*.java
 
 run:
-       $(JAVACMD) -classpath /usr/share/java/junit4.jar:. org.junit.runner.JUnitCore All
+       $(JAVACMD) -classpath $(JUNIT_JAR):. org.junit.runner.JUnitCore All
 
 
 ## Local variables: