From bd73a0641615d743663ef652bc1f27305af1517b Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 8 Apr 2025 16:55:48 +0000
Subject: [PATCH] 8300339: Run jtreg in the work dir

Reviewed-by: erikj
---
 make/RunTests.gmk | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 7aa0082e0ae..ebae510fc07 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -995,24 +995,27 @@ define SetupRunJtregTestBody
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 	$$(RM) -r $$($1_TEST_RESULTS_DIR)
 
+  $1_JTREG_ARGUMENTS := \
+      $$($1_JTREG_LAUNCHER_OPTIONS) \
+      -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
+      $$($1_JTREG_BASIC_OPTIONS) \
+      -testjdk:$$(JDK_UNDER_TEST) \
+      -dir:$$(JTREG_TOPDIR) \
+      -reportDir:$$($1_TEST_RESULTS_DIR) \
+      -workDir:$$($1_TEST_SUPPORT_DIR) \
+      -report:$${JTREG_REPORT} \
+      $$$${JTREG_STATUS} \
+      $$(JTREG_OPTIONS) \
+      $$(JTREG_FAILURE_HANDLER_OPTIONS) \
+      $$(JTREG_COV_OPTIONS) \
+      $$($1_TEST_NAME) \
+      #
+
   $1_COMMAND_LINE := \
-      $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
-          -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
-          $$($1_JTREG_BASIC_OPTIONS) \
-          -testjdk:$$(JDK_UNDER_TEST) \
-          -dir:$$(JTREG_TOPDIR) \
-          -reportDir:$$($1_TEST_RESULTS_DIR) \
-          -workDir:$$($1_TEST_SUPPORT_DIR) \
-          -report:$${JTREG_REPORT} \
-          $$$${JTREG_STATUS} \
-          $$(JTREG_OPTIONS) \
-          $$(JTREG_FAILURE_HANDLER_OPTIONS) \
-          $$(JTREG_COV_OPTIONS) \
-          $$($1_TEST_NAME) \
+      cd $$($1_TEST_SUPPORT_DIR) && $$(JTREG_JAVA) $$($1_JTREG_ARGUMENTS) \
       && $$(ECHO) $$$$? > $$($1_EXITCODE) \
       || $$(ECHO) $$$$? > $$($1_EXITCODE)
 
-
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     $1_COMMAND_LINE := \
         for i in {0..$$(JTREG_RETRY_COUNT)}; do \