From b822521a6c52a23a9271271ea4834c1900930771 Mon Sep 17 00:00:00 2001 From: lanxia Date: Wed, 10 Apr 2019 14:10:21 -0400 Subject: [PATCH] Archive openjdk regression tests output including diagnostic files - Change workDir from $(TEST_RESROOT) to TKG $(REPORTDIR) so it will be archived by default - Do not need to archive *.jtr separately as *.jtr are under $(REPORTDIR) and they will be archived by default Signed-off-by: lanxia --- buildenv/jenkins/JenkinsfileBase | 5 --- openjdk_regression/playlist.xml | 76 ++++++++++++++++---------------- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index dc329c0661..2fec2730c4 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -339,7 +339,6 @@ def post(output_name) { output_name = output_name.replace("/","_"); def tar_cmd = "tar -zcf" def suffix = ".tar.gz" - def tar_opt = "-T -" def pax_opt = "" if (SPEC.startsWith('zos')) { echo 'Converting tap file from ebcdic to ascii...' @@ -352,7 +351,6 @@ def post(output_name) { tar_cmd = "pax -wf" suffix = ".pax.Z" pax_opt = "-x pax" - tar_opt = "" } boolean failIfNoResultsValue = true @@ -364,14 +362,11 @@ def post(output_name) { junit allowEmptyResults: true, keepLongStdio: true, testResults: '**/work/**/*.jtr.xml, **/junitreports/**/*.xml, **/external_test_reports/**/*.xml' if (currentBuild.result == 'UNSTABLE' || params.ARCHIVE_TEST_RESULTS) { def test_output_tar_name = "${output_name}_test_output${suffix}" - def jtr_output_tar_name = "jtr_test_output${suffix}" sh "${tar_cmd} ${test_output_tar_name} ${pax_opt} ./openjdk-tests/TestConfig/test_output_*" - sh "find ./jvmtest/${env.BUILD_LIST}/work -name '*.jtr' | ${tar_cmd} ${jtr_output_tar_name} ${tar_opt} ${pax_opt}" if (!params.ARTIFACTORY_SERVER) { echo "ARTIFACTORY_SERVER is not set. Saving artifacts on jenkins." archiveArtifacts artifacts: test_output_tar_name, fingerprint: true, allowEmptyArchive: true - archiveArtifacts artifacts: jtr_output_tar_name, fingerprint: true, allowEmptyArchive: true } } //for performance test, achive regardless the build result diff --git a/openjdk_regression/playlist.xml b/openjdk_regression/playlist.xml index 9df5a57d26..ea575dbe08 100644 --- a/openjdk_regression/playlist.xml +++ b/openjdk_regression/playlist.xml @@ -21,7 +21,7 @@     $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ $(Q)$(JTREG_TEST_DIR)$(D)$(JDK_CUSTOM_TARGET)$(Q); \ @@ -40,7 +40,7 @@     $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx768m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ $(Q)$(JTREG_LANGTOOLS_TEST_DIR)$(D)$(LANGTOOLS_CUSTOM_TARGET)$(Q); \ @@ -56,7 +56,7 @@ hotspot_all $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ $(Q)$(JTREG_HOTSPOT_TEST_DIR):hotspot_all$(Q); \ @@ -79,7 +79,7 @@ hotspot_all_SE100 $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ $(Q)$(JTREG_HOTSPOT_TEST_DIR):hotspot_all$(Q); \ @@ -102,7 +102,7 @@ hotspot_jre $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(TEST_RESROOT)$(D)ProblemList_$(JVM_VERSION).txt$(Q) \ @@ -126,7 +126,7 @@ jdk_awt $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -145,7 +145,7 @@ jdk_beans $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -163,7 +163,7 @@ jdk_io $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -181,7 +181,7 @@ jdk_lang $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -199,7 +199,7 @@ jdk_math $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -217,7 +217,7 @@ jdk_math_jre $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -compilejdk:$(Q)$(JDK_HOME)$(Q) \ -jdk:$(Q)$(JRE_IMAGE)$(Q) \ @@ -241,7 +241,7 @@ jdk_other $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -259,7 +259,7 @@ jdk_net $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -277,7 +277,7 @@ jdk_nio $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -295,7 +295,7 @@ jdk_security1 $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -313,7 +313,7 @@ jdk_security2 $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -331,7 +331,7 @@ jdk_security3 $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -349,7 +349,7 @@ jdk_security4 $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -367,7 +367,7 @@ jdk_sound $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -386,7 +386,7 @@ jdk_swing export DISPLAY=:1; $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -405,7 +405,7 @@ jdk_text $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -423,7 +423,7 @@ jdk_util $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -441,7 +441,7 @@ jdk_time $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -459,7 +459,7 @@ jdk_management $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -477,7 +477,7 @@ jdk_jmx $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -495,7 +495,7 @@ jdk_rmi $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -513,7 +513,7 @@ jdk_tools $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -531,7 +531,7 @@ jdk_jdi $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -549,7 +549,7 @@ jdk_jfr $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -567,7 +567,7 @@ jdk_instrument $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -589,7 +589,7 @@ jdk_svc_sanity $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -610,7 +610,7 @@ build $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -631,7 +631,7 @@ jdk_imageio $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -653,7 +653,7 @@ jdk_client_sanity $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -674,7 +674,7 @@ jdk_security_infra $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -695,7 +695,7 @@ jdk_native_sanity $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -720,7 +720,7 @@ jdk_2d $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \ @@ -742,7 +742,7 @@ jfc_demo $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ - -w $(Q)$(TEST_RESROOT)$(D)work$(Q) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(TEST_RESROOT)$(D)report$(Q) \ -jdk:$(Q)$(JDK_HOME)$(Q) \ -exclude:$(Q)$(JTREG_TEST_DIR)$(D)ProblemList.txt$(Q) \