diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2014-09-09 22:19:42 -0400 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-19 09:06:41 +0000 |
| commit | 4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4 (patch) | |
| tree | 46c93b42f787f25d17420e722f4a3786fdecd84a /configure.ac | |
| parent | 2f270990f4ea53c941af0f1b8b1d06e18fc22606 (diff) | |
Add support for external hamcrest when using junit 4.11+
Starting with junit 4.11 hamcrest is no longer bundled,
so add a --with-hamcrest option to support this.
Change-Id: Icdae946af82b9c56bf25d37cbf88275fc6a6a1eb
Reviewed-on: https://gerrit.libreoffice.org/11383
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 51 |
1 files changed, 45 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e5c01e860fde..84add6c6f9b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1987,6 +1987,15 @@ AC_ARG_WITH(junit, ], ,with_junit=yes) +AC_ARG_WITH(hamcrest, + AS_HELP_STRING([--with-hamcrest], + [Specifies the hamcrest jar file to use for JUnit-based tests. + --without-junit disables those tests. Not relevant in the --without-java case.]) + [ + Usage: --with-hamcrest=<absolute path to hamcrest jar> + ], +,with_hamcrest=yes) + AC_ARG_WITH(perl-home, AS_HELP_STRING([--with-perl-home], [If you have installed Perl 5 Distribution, on your system, please @@ -12051,23 +12060,53 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then if test "$_os" = "WINNT"; then OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"` fi - printf 'import org.junit.Before; import org.hamcrest.BaseDescription;' \ - > conftest.java + printf 'import org.junit.Before;' > conftest.java if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_ERROR( -[cannot find JUnit 4 jar, or JUnit 4 jar does not provide Hamcrest; please -install one in the default location (/usr/share/java), specify its pathname via ---with-junit=..., or disable it via --without-junit]) +[cannot find JUnit 4 jar; please install one in the default location (/usr/share/java), + specify its pathname via --with-junit=..., or disable it via --without-junit]) fi - rm -f conftestj.class conftestj.java + rm -f conftest.class conftest.java if test $OOO_JUNIT_JAR != ""; then BUILD_TYPE="$BUILD_TYPE QADEVOOO" fi fi AC_SUBST(OOO_JUNIT_JAR) +HAMCREST_JAR= +if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then + AC_MSG_CHECKING([for included Hamcrest]) + printf 'import org.hamcrest.BaseDescription;' > conftest.java + if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then + AC_MSG_RESULT([Included in $OOO_JUNIT_JAR]) + else + AC_MSG_RESULT([Not included]) + AC_MSG_CHECKING([for standalone hamcrest jar.]) + if test "$with_hamcrest" = "yes"; then + if test -e /usr/share/lib/java/hamcrest.jar; then + HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar + else + HAMCREST_JAR=/usr/share/java/hamcrest.jar + fi + else + HAMCREST_JAR=$with_hamcrest + fi + if test "$_os" = "WINNT"; then + HAMCREST_JAR=`cygpath -m "$HAMCREST_JAR"` + fi + if "$JAVACOMPILER" -classpath "$HAMCREST_JAR" conftest.java >&5 2>&5; then + AC_MSG_RESULT([$HAMCREST_JAR]) + else + AC_MSG_ERROR([junit does not contain hamcrest; please use a junit jar that includes hamcrest, install a hamcrest jar in the default location (/usr/share/java), + specify its path with --with-hamcrest=..., or disable junit with --without-junit]) + fi + fi + rm -f conftest.class conftest.java +fi +AC_SUBST(HAMCREST_JAR) + AC_SUBST(SCPDEFS) |