From 8cd89aa90280509ed87dabe45787a71a23600b2e Mon Sep 17 00:00:00 2001
From: OpenJDK Team <openjdk-17@packages.debian.org>
Date: Tue, 26 Dec 2023 13:18:48 +0100
Subject: [PATCH] jtreg-location

Gbp-Pq: Name jtreg-location.diff
---
 make/RunTests.gmk                 | 2 +-
 make/autoconf/lib-tests.m4        | 6 +++---
 make/test/BuildFailureHandler.gmk | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 9a0eb11d0..dc91d1484 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -847,7 +847,7 @@ define SetupRunJtregTestBody
 
   $1_COMMAND_LINE := \
       $$(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 43ed2aaaf..c7b136da1 100644
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -179,7 +179,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
 
@@ -193,7 +193,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
@@ -209,7 +209,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 e69c9bf6f..8050cc0d0 100644
--- 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
-- 
2.30.2