jtreg-location

Gbp-Pq: Name jtreg-location.diff

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 08783c84321050403ead41c72eef4ee05dbc13e3..d166539c32c99535ba93bdae8b28701018562108 100644 (file)
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -849,7 +849,7 @@ define SetupRunJtregTestBody
 
   $1_COMMAND_LINE := \
       $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
-          -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
+          -Dprogram=jtreg -jar $$(if $$(wildcard $$(JT_HOME)/lib/jtreg.jar),$$(JT_HOME)/lib/jtreg.jar,$$(JT_HOME)/share/java/jtreg.jar) \
           $$($1_JTREG_BASIC_OPTIONS) \
           -testjdk:$$(JDK_UNDER_TEST) \
           -dir:$$(JTREG_TOPDIR) \

diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
index 93a2b30dc7e6b30941240df597ee664d3509e92e..700fae28cb9329d08bbba199478feff801563030 100644 (file)
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -173,7 +173,7 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
       AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg does not exist])
     fi
 
-    if test ! -e "$JT_HOME/lib/jtreg.jar"; then
+    if test ! -e "$JT_HOME/lib/jtreg.jar" && test ! -e "$JT_HOME/share/java/jtreg.jar"; then
       AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg is not a valid jtreg home])
     fi
 
@@ -187,7 +187,7 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
         AC_MSG_WARN([Ignoring JT_HOME pointing to invalid directory: $JT_HOME])
         JT_HOME=
       else
-        if test ! -e "$JT_HOME/lib/jtreg.jar"; then
+        if test ! -e "$JT_HOME/lib/jtreg.jar" && test ! -e "$JT_HOME/share/java/jtreg.jar"; then
           AC_MSG_WARN([Ignoring JT_HOME which is not a valid jtreg home: $JT_HOME])
           JT_HOME=
         else
@@ -203,7 +203,7 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
       if test "x$JTREGEXE" != x; then
         # That's good, now try to derive JT_HOME
         JT_HOME=`(cd $($DIRNAME $JTREGEXE)/.. && pwd)`
-        if test ! -e "$JT_HOME/lib/jtreg.jar"; then
+        if test ! -e "$JT_HOME/lib/jtreg.jar" && test ! -e "$JT_HOME/share/java/jtreg.jar"; then
           AC_MSG_WARN([Ignoring jtreg from path since a valid jtreg home cannot be found])
           JT_HOME=
         else

diff --git a/make/test/BuildFailureHandler.gmk b/make/test/BuildFailureHandler.gmk
index e69c9bf6fea68bed3e6d71c0fb18180971fd995a..8050cc0d043839fee7e9ca203eb2840daf6abae9 100644 (file)
--- a/make/test/BuildFailureHandler.gmk
+++ b/make/test/BuildFailureHandler.gmk
@@ -38,7 +38,7 @@ FH_BASEDIR := $(TOPDIR)/test/failure_handler
 FH_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/failure_handler
 FH_JAR := $(FH_SUPPORT)/jtregFailureHandler.jar
 
-JTREG_JAR := $(JT_HOME)/lib/jtreg.jar
+JTREG_JAR := $(if $(wildcard $(JT_HOME)/lib/jtreg.jar),$(JT_HOME)/lib/jtreg.jar,$(JT_HOME)/share/java/jtreg.jar)
 ifeq ($(wildcard $(JTREG_JAR)), )
   $(error Cannot build failure handler without jtreg)
 endif