From 2a0cf8353ae0528a8417407d5719df0dadceadcf Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 9 Apr 2025 03:03:14 +0000
Subject: [PATCH] 8354088: [BACKOUT]  Run jtreg in the work dir

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

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index ebae510fc07..7aa0082e0ae 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -995,27 +995,24 @@ 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 := \
-      cd $$($1_TEST_SUPPORT_DIR) && $$(JTREG_JAVA) $$($1_JTREG_ARGUMENTS) \
+      $$(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) \
       && $$(ECHO) $$$$? > $$($1_EXITCODE) \
       || $$(ECHO) $$$$? > $$($1_EXITCODE)
 
+
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     $1_COMMAND_LINE := \
         for i in {0..$$(JTREG_RETRY_COUNT)}; do \