diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -515,6 +515,8 @@ FILE:=@FILE@ HG:=@HG@ OBJCOPY:=@OBJCOPY@ SETFILE:=@SETFILE@ +JT_HOME:=@JT_HOME@ +JTREGEXE:=@JTREGEXE@ FIXPATH:=@FIXPATH@ diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -474,6 +474,9 @@ if test "x$OPENJDK_TARGET_OS" = "xmacosx BASIC_FIXUP_EXECUTABLE(LIPO) fi +# find JTREG for running tests +TOOLCHAIN_SETUP_JTREG + # Restore old path without tools dir PATH="$OLD_PATH" ]) @@ -1025,3 +1028,28 @@ AC_SUBST(LDFLAGS_JDKLIB_SUFFIX) AC_SUBST(LDFLAGS_JDKEXE_SUFFIX) AC_SUBST(LDFLAGS_CXX_JDK) ]) + +# Setup the JTREG paths +AC_DEFUN([TOOLCHAIN_SETUP_JTREG], +[ + AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], + [Regression Test Harness @<:@probed@:>@])]) + + AC_MSG_CHECKING([for JTReg Regression Test Harness]) + + if test "x$with_jtreg" != x; then + JT_HOME="$with_jtreg" + elif test "x$JT_HOME" == x; then + AC_MSG_ERROR([Could not find JTReg Regression Test Harness]) + fi + + AC_MSG_RESULT([$JT_HOME]) + + # jtreg win32 script works for everybody + JTREGEXE="$JT_HOME"/win32/bin/jtreg + + # BASIC_FIXUP_EXECUTABLE(JTREGEXE) + + AC_SUBST(JT_HOME) + AC_SUBST(JTREGEXE) +])