1.1 --- a/common/autoconf/toolchain.m4 Wed May 22 17:26:31 2013 +0200
1.2 +++ b/common/autoconf/toolchain.m4 Tue May 28 08:50:52 2013 +0200
1.3 @@ -479,6 +479,8 @@
1.4 BASIC_FIXUP_EXECUTABLE(LIPO)
1.5 fi
1.6
1.7 +TOOLCHAIN_SETUP_JTREG
1.8 +
1.9 # Restore old path without tools dir
1.10 PATH="$OLD_PATH"
1.11 ])
1.12 @@ -1089,3 +1091,29 @@
1.13 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
1.14 AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
1.15 ])
1.16 +
1.17 +# Setup the JTREG paths
1.18 +AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
1.19 +[
1.20 + AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg],
1.21 + [Regression Test Harness @<:@probed@:>@])])
1.22 +
1.23 + AC_MSG_CHECKING([for JTReg Regression Test Harness])
1.24 +
1.25 + if test "x$with_jtreg" != x; then
1.26 + JT_HOME="$with_jtreg"
1.27 + BASIC_FIXUP_PATH([JT_HOME])
1.28 + AC_MSG_RESULT($JT_HOME)
1.29 +
1.30 + # jtreg win32 script works for everybody
1.31 + JTREGEXE="$JT_HOME/win32/bin/jtreg"
1.32 + if test ! -f "$JTREGEXE"; then
1.33 + AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
1.34 + fi
1.35 + else
1.36 + AC_MSG_RESULT(no)
1.37 + fi
1.38 +
1.39 + AC_SUBST(JT_HOME)
1.40 + AC_SUBST(JTREGEXE)
1.41 +])
