diff --git a/functional/security/Crypto/playlist.xml b/functional/security/Crypto/playlist.xml index 1e68077584..15326744ef 100644 --- a/functional/security/Crypto/playlist.xml +++ b/functional/security/Crypto/playlist.xml @@ -41,9 +41,9 @@ - export JTREG_HOME="$(TEST_RESROOT)$(D)jtreg" ; \ + export JTREG_HOME=$(Q)$(JTREG_HOME)$(Q) ; \ if [ "x${SKIP_AGENT_TESTS}" = "x" ] ; then export SKIP_AGENT_TESTS=1 ; fi ; \ - $(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS) + $(TEST_ROOT)$(D)functional$(D)security$(D)Crypto$(D)CryptoTest$(D)run.sh $(Q)$(TEST_JDK_HOME)$(Q) ; $(TEST_STATUS) FIPS140_2:nonapplicable @@ -78,7 +78,7 @@ .*solaris - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)(Q) \ -a -xml -v:fail,error,time,nopass,summary -Dcryptotests.skipAgentTests=1 -timeoutFactor:2 \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ diff --git a/functional/security/ssl-tests/playlist.xml b/functional/security/ssl-tests/playlist.xml index 208153b69b..2725b153c1 100644 --- a/functional/security/ssl-tests/playlist.xml +++ b/functional/security/ssl-tests/playlist.xml @@ -23,8 +23,8 @@ - JTREG_HOME="$(TEST_RESROOT)$(D)jtreg" \ - $(TEST_ROOT)$(D)functional$(D)security$(D)ssl-tests$(D)ssl-tests$(D)run.sh "$(TEST_JDK_HOME)" ; $(TEST_STATUS) + JTREG_HOME=$(Q)$(JTREG_HOME)$(Q) \ + $(TEST_ROOT)$(D)functional$(D)security$(D)ssl-tests$(D)ssl-tests$(D)run.sh $(Q)$(TEST_JDK_HOME)$(Q) ; $(TEST_STATUS) dev diff --git a/get.sh b/get.sh index b1a6423cab..64ebaf76bb 100755 --- a/get.sh +++ b/get.sh @@ -24,8 +24,8 @@ CLONE_OPENJ9="true" OPENJ9_REPO="https://github.com/eclipse-openj9/openj9.git" OPENJ9_SHA="" OPENJ9_BRANCH="" -TKG_REPO="https://github.com/adoptium/TKG.git" -TKG_BRANCH="master" +TKG_REPO="https://github.com/judovana/TKG.git" +TKG_BRANCH="setupAbleJtreg" VENDOR_REPOS="" VENDOR_SHAS="" VENDOR_BRANCHES="" diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml index 2af4526c61..4b0e566745 100644 --- a/openjdk/playlist.xml +++ b/openjdk/playlist.xml @@ -16,7 +16,7 @@ openjdk.mk jdk_custom - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -45,7 +45,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -75,7 +75,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -116,7 +116,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -138,7 +138,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -165,7 +165,7 @@ NoOptions - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -196,7 +196,7 @@ NoOptions - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -227,7 +227,7 @@ NoOptions - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -262,7 +262,7 @@ NoOptions - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -292,7 +292,7 @@ hotspot_compiler - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -320,7 +320,7 @@ hotspot_gc - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -346,7 +346,7 @@ hotspot_runtime - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -372,7 +372,7 @@ hotspot_serviceability - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -403,7 +403,7 @@ https://github.com/adoptium/temurin-build/issues/3956 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -431,7 +431,7 @@ hotspot_tier1_compiler - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -459,7 +459,7 @@ hotspot_tier1_gc - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -485,7 +485,7 @@ hotspot_tier1_runtime - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -511,7 +511,7 @@ hotspot_tier1_serviceability - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -542,7 +542,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -580,7 +580,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -618,7 +618,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -663,7 +663,7 @@ ibm - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -692,7 +692,7 @@ hotspot_sanity - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -720,7 +720,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -765,7 +765,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -813,7 +813,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -843,7 +843,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -874,7 +874,7 @@ $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode650 $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -904,7 +904,7 @@ $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode501 $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode501 -XXgc:fvtest_forceCopyForwardHybridMarkCompactRatio=10 - $(JAVA_COMMAND) -Xmx768m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx768m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -939,7 +939,7 @@ $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode650 $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -972,7 +972,7 @@ $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode650 $(TEST_VARIATION_DUMP) $(TEST_VARIATION_JIT_PREVIEW) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1006,7 +1006,7 @@ $(TEST_VARIATION_JIT_AGGRESIVE) $(TEST_VARIATION_JIT_PREVIEW) Mode650 $(TEST_VARIATION_JIT_AGGRESIVE) $(TEST_VARIATION_JIT_PREVIEW) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1046,7 +1046,7 @@ $(TEST_VARIATION_JIT_AGGRESIVE) $(TEST_VARIATION_JIT_PREVIEW) -Xjit:scratchSpaceFactorWhenJSR292Workload=1 Mode650 $(TEST_VARIATION_JIT_AGGRESIVE) $(TEST_VARIATION_JIT_PREVIEW) -Xjit:scratchSpaceFactorWhenJSR292Workload=1 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1080,7 +1080,7 @@ $(TEST_VARIATION_JIT_AGGRESIVE) $(TEST_VARIATION_JIT_PREVIEW) Mode650 $(TEST_VARIATION_JIT_AGGRESIVE) $(TEST_VARIATION_JIT_PREVIEW) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1114,7 +1114,7 @@ $(TEST_VARIATION_DUMP) Mode650 $(TEST_VARIATION_DUMP) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1145,7 +1145,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1182,7 +1182,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1218,7 +1218,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1243,7 +1243,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1280,7 +1280,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1318,7 +1318,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1351,7 +1351,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1393,7 +1393,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1419,7 +1419,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1457,7 +1457,7 @@ -Dsemeru.fips=true -Dsemeru.customprofile=OpenJCEPlusFIPS.FIPS140-3-Test-TLS-PKCS12 -Djava.security.properties=$(JTREG_JDK_TEST_DIR)/javax/net/ssl/TLSTest_java.security -Dsemeru.fips=true -Dsemeru.customprofile=OpenJCEPlusFIPS.FIPS140-3-Test-TLS-JKS -Djava.security.properties=$(JTREG_JDK_TEST_DIR)/javax/net/ssl/TLSTest_java.security - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q) $(JVM_OPTIONS) -Xmx512m $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1501,7 +1501,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1536,7 +1536,7 @@ Mode650 Mode1000 - export DISPLAY=:1; $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + export DISPLAY=:1; $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1567,7 +1567,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1598,7 +1598,7 @@ $(TEST_VARIATION_DUMP) Mode650 $(TEST_VARIATION_DUMP) Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx1540m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1640,7 +1640,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1681,7 +1681,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1718,7 +1718,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1743,7 +1743,7 @@ jdk_restricted_security - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1773,7 +1773,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1815,7 +1815,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1846,7 +1846,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -1890,7 +1890,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1939,7 +1939,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx768m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -1967,7 +1967,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(ADD_MODULES) $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2011,7 +2011,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2062,7 +2062,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2110,7 +2110,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2144,7 +2144,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2182,7 +2182,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2229,7 +2229,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2274,7 +2274,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2317,7 +2317,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2361,7 +2361,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2387,7 +2387,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2420,7 +2420,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2467,7 +2467,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2514,7 +2514,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2547,7 +2547,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2581,7 +2581,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2615,7 +2615,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2661,7 +2661,7 @@ Mode650 Mode1000 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS_WO_EXTRA_OPTS) $(SPECIAL_CONCURRENCY) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2693,7 +2693,7 @@ -Xjit:{*Float128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2727,7 +2727,7 @@ -Xjit:{*Double128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2761,7 +2761,7 @@ -Xjit:{*Int128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2795,7 +2795,7 @@ -Xjit:{*Short128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2829,7 +2829,7 @@ -Xjit:{*Byte128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2863,7 +2863,7 @@ -Xjit:{*Long128VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2897,7 +2897,7 @@ -Xjit:{*Byte64VectorTests*}(count=1,enforceVectorAPIExpansion),disableAsyncCompilation,disableSuffixLogs,verbose={vectorAPI} - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ @@ -2928,7 +2928,7 @@ dragonwell8_feature_jdk0 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2960,7 +2960,7 @@ dragonwell8_feature_jdk1 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -2992,7 +2992,7 @@ dragonwell8_feature_jdk2 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ -agentvm -a -ea -esa -v:fail,error,time,nopass -retain:fail,error,*.dmp,javacore.*,heapdump.*,*.trc \ -ignore:quiet -timeoutFactor:1 -xml:verify -concurrency:1 -k:'!headful' -vmoptions:"-Xmx512m" \ -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ @@ -3025,7 +3025,7 @@ dragonwell8_feature_jdk3 - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -3057,7 +3057,7 @@ dragonwell8_tenant_jdk sudo ${TEST_JDK_HOME}$(D)bin$(D)jgroup -u ${USER} -g ${USER} ; \ - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -3088,7 +3088,7 @@ dragonwell8_elastic-heap_jdk - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -3119,7 +3119,7 @@ dragonwell8_elastic-heap_hotspot - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -3150,7 +3150,7 @@ dragonwell8_jwarmup_hotspot - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -3182,7 +3182,7 @@ dragonwell8_tenant_hotspot sudo ${TEST_JDK_HOME}$(D)bin$(D)jgroup -u ${USER} -g ${USER} ; \ - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS)$(Q) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \ -r $(Q)$(REPORTDIR)$(D)report$(Q) \ @@ -3223,7 +3223,7 @@ ibm - $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(JTREG_JAR)$(Q) \ $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx768m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ $(TIMEOUT_HANDLER) \ -w $(Q)$(REPORTDIR)$(D)work$(Q) \