@@ -227,12 +227,48 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
227227 UTIL_FIXUP_PATH(JT_HOME)
228228 AC_SUBST ( JT_HOME )
229229
230+ # Specify a JDK for running jtreg. Defaults to the BOOT_JDK.
231+ AC_ARG_WITH ( jtreg-jdk , [ AS_HELP_STRING ( [ --with-jdk]
232+ [ path to JDK for running jtreg @<:@ BOOT_JDK@:>@ ] ) ] )
233+
234+ AC_MSG_CHECKING ( [ for jtreg jdk] )
235+ if test "x${with_jtreg_jdk}" != x; then
236+ if test "x${with_jtreg_jdk}" = xno; then
237+ AC_MSG_RESULT ( [ no, jtreg jdk not specified] )
238+ elif test "x${with_jtreg_jdk}" = xyes; then
239+ AC_MSG_RESULT ( [ not specified] )
240+ AC_MSG_ERROR ( [ --with-jtreg-jdk needs a value] )
241+ else
242+ JTREG_JDK="${with_jtreg_jdk}"
243+ AC_MSG_RESULT ( [ $JTREG_JDK] )
244+ UTIL_FIXUP_PATH(JTREG_JDK)
245+ if test ! -f "$JTREG_JDK/bin/java"; then
246+ AC_MSG_ERROR ( [ Could not find jtreg java at $JTREG_JDK/bin/java] )
247+ fi
248+ fi
249+ else
250+ JTREG_JDK="${BOOT_JDK}"
251+ AC_MSG_RESULT ( [ no, using BOOT_JDK] )
252+ fi
253+
254+ JTREG_JAVA="$JTREG_JDK/bin/java"
255+ UTIL_FIXUP_PATH(JTREG_JAVA)
256+ JTREG_JAVA="$FIXPATH $JTREG_JAVA"
257+ AC_SUBST ( [ JTREG_JAVA] )
258+
259+
230260 # Verify jtreg version
231261 if test "x$JT_HOME" != x; then
262+ AC_MSG_CHECKING ( [ jtreg jar existence] )
263+ if test ! -f "$JT_HOME/lib/jtreg.jar"; then
264+ AC_MSG_ERROR ( [ Could not find jtreg jar at $JT_HOME/lib/jtreg.jar] )
265+ fi
266+
232267 AC_MSG_CHECKING ( [ jtreg version number] )
233268 # jtreg -version looks like this: "jtreg 6.1+1-19"
234269 # Extract actual version part ("6.1" in this case)
235- jtreg_version_full=`$JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2`
270+ jtreg_version_full=$($JTREG_JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2)
271+
236272 jtreg_version=${jtreg_version_full/%+*}
237273 AC_MSG_RESULT ( [ $jtreg_version] )
238274
0 commit comments