Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Execute all tests in report dir #2989

Merged
merged 1 commit into from
Oct 1, 2018
Merged

Execute all tests in report dir #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/TestConfig/openj9Settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ifndef JAVATEST_ROOT
$(error JAVATEST_ROOT is needed for uploading files to result store)
endif
AXXONRESULTSSERVER=vmfarm.ottawa.ibm.com:31
TEST_STATUS=if [ $$? -eq 0 ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED$(Q); $(ECHO) $(Q)$(Q); else perl $(Q)-I$(JAVATEST_ROOT)$(D)lib$(D)perl$(Q) -mResultStore::Uploader -e $(Q)ResultStore::Uploader::upload('.',$(BUILD_ID),$(JOB_ID),'$(AXXONRESULTSSERVER)','results-$(JOB_ID)')$(Q); $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED$(Q); $(ECHO) $(Q)$(Q); fi
TEST_STATUS=if [ $$? -eq 0 ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED$(Q); $(ECHO) $(Q)$(Q); $(CD) $(TEST_ROOT); $(RM) -r $(REPORTDIR); else perl $(Q)-I$(JAVATEST_ROOT)$(D)lib$(D)perl$(Q) -mResultStore::Uploader -e $(Q)ResultStore::Uploader::upload('.',$(BUILD_ID),$(JOB_ID),'$(AXXONRESULTSSERVER)','results-$(JOB_ID)')$(Q); $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED$(Q); $(ECHO) $(Q)$(Q); fi
endif

#######################################
Expand Down
4 changes: 2 additions & 2 deletions test/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ sub writeTargets {
print $fhOut "$name: TEST_GROUP=" . $levelStr . "\n";
my $indent .= "\t";
print $fhOut "$name:\n";
print $fhOut "$indent\@\$(MKTREE) \$(REPORTDIR);\n";
print $fhOut "$indent\@echo \"\" | tee -a \$(Q)\$(TESTOUTPUT)\$(D)TestTargetResult\$(Q);\n";
print $fhOut "$indent\@echo \"===============================================\" | tee -a \$(Q)\$(TESTOUTPUT)\$(D)TestTargetResult\$(Q);\n";
print $fhOut "$indent\@echo \"Running test \$\@ ...\" | tee -a \$(Q)\$(TESTOUTPUT)\$(D)TestTargetResult\$(Q);\n";
Expand All @@ -452,7 +451,8 @@ sub writeTargets {
my $command = $test->{'command'};
$command =~ s/^\s+//;
$command =~ s/\s+$//;
print $fhOut "$indent\{ $command; \} 2>&1 | tee -a \$(Q)\$(TESTOUTPUT)\$(D)TestTargetResult\$(Q);\n";

print $fhOut "$indent\{ \$(MKTREE) \$(REPORTDIR); \\\n$indent\$(CD) \$(REPORTDIR); \\\n$indent$command; \} 2>&1 | tee -a \$(Q)\$(TESTOUTPUT)\$(D)TestTargetResult\$(Q);\n";

if (defined($capabilityReqs)) {
foreach my $key (keys %capabilityReqs_Hash) {
Expand Down
3 changes: 2 additions & 1 deletion test/TestConfig/settings.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ REPORTDIR = $(Q)$(TESTOUTPUT)$(D)$@$(Q)
#######################################
# TEST_STATUS
#######################################
TEST_STATUS=if [ $$? -eq 0 ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED$(Q); $(ECHO) $(Q)$(Q); else $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED$(Q); $(ECHO) $(Q)$(Q); fi
TEST_STATUS=if [ $$? -eq 0 ] ; then $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_PASSED$(Q); $(ECHO) $(Q)$(Q); $(CD) $(TEST_ROOT); $(RM) -r $(REPORTDIR); else $(ECHO) $(Q)$(Q); $(ECHO) $(Q)$@$(Q)$(Q)_FAILED$(Q); $(ECHO) $(Q)$(Q); fi
ifneq ($(DEBUG),)
$(info TEST_STATUS is $(TEST_STATUS))
endif
Expand Down Expand Up @@ -260,6 +260,7 @@ setup_%:
@$(ECHO) set JCL_VERSION to $(JCL_VERSION)
@$(ECHO) set JAVA_BIN to $(JAVA_BIN)
@$(ECHO) set SPEC to $(SPEC)
@$(MKTREE) $(Q)$(TESTOUTPUT)$(Q)
@$(ECHO) Running $(TESTTARGET) ...
@if [ $(TOTALCOUNT) -ne 0 ]; then \
$(ECHO) There are $(TOTALCOUNT) test targets in $(TESTTARGET).; \
Expand Down
12 changes: 3 additions & 9 deletions test/functional/DDR_Test/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../TestConfig/playlist.xsd">
<test>
<testCaseName>testDDRExt_General_ibm</testCaseName>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_ROOT=${TEST_ROOT} -DJDK_HOME=${JDK_HOME} -DJDK_VERSION=${JDK_VERSION} \
<command>ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_ROOT=${TEST_ROOT} -DJDK_HOME=${JDK_HOME} -DJDK_VERSION=${JDK_VERSION} \
-DTEST_RESROOT=$(TEST_RESROOT) -DRESOURCES_DIR=${RESOURCES_DIR} -DREPORTDIR=${REPORTDIR} -DOS=${OS} -DBITS=$(BITS) \
-Dtest.list=$(Q)TestDDRExtensionGeneral$(Q) -DADDITIONALEXPORTS=-showversion -f $(Q)$(TEST_RESROOT)$(D)tck_ddrext.xml$(Q); \
$(TEST_STATUS)</command>
Expand All @@ -51,9 +49,7 @@

<test>
<testCaseName>testDDRExt_General_openj9</testCaseName>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_ROOT=${TEST_ROOT} -DJDK_HOME=${JDK_HOME} -DJDK_VERSION=${JDK_VERSION} \
<command>ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_ROOT=${TEST_ROOT} -DJDK_HOME=${JDK_HOME} -DJDK_VERSION=${JDK_VERSION} \
-DTEST_RESROOT=$(TEST_RESROOT) -DRESOURCES_DIR=${RESOURCES_DIR} -DREPORTDIR=${REPORTDIR} -DOS=${OS} -DBITS=$(BITS) \
-Dtest.list=$(Q)TestDDRExtensionGeneral$(Q) -DADDITIONALEXPORTS=-showversion -f $(Q)$(TEST_RESROOT)$(D)tck_ddrext.xml$(Q); \
$(TEST_STATUS)</command>
Expand All @@ -78,9 +74,7 @@

<test>
<testCaseName>testDDRExt_General_win</testCaseName>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_ROOT=${TEST_ROOT} -DJDK_HOME=${JDK_HOME} -DJDK_VERSION=${JDK_VERSION} \
<command>ant -DJAVA_COMMAND=$(JAVA_COMMAND) -DTEST_ROOT=${TEST_ROOT} -DJDK_HOME=${JDK_HOME} -DJDK_VERSION=${JDK_VERSION} \
-DTEST_RESROOT=$(TEST_RESROOT) -DRESOURCES_DIR=${RESOURCES_DIR} -DREPORTDIR=${REPORTDIR} -DOS=${OS} -DBITS=$(BITS) \
-Dtest.list=$(Q)TestDDRExtensionGeneral$(Q) -DADDITIONALEXPORTS=-showversion -f $(Q)$(TEST_RESROOT)$(D)tck_ddrext.xml$(Q); \
$(TEST_STATUS)</command>
Expand Down
3 changes: 1 addition & 2 deletions test/functional/JIT_Test/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xjit:count=1,disableAsyncCompilation,verbose,vlog="$(REPORTDIR)$(D)jitv.log" \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xjit:count=1,disableAsyncCompilation,verbose,vlog="$(REPORTDIR)$(D)jitv.log" \
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)jitt.jar$(Q) \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) \
-testnames stringConcatOptTest -groups $(TEST_GROUP) \
Expand Down
4 changes: 0 additions & 4 deletions test/functional/JLM_Tests/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,8 +1129,6 @@
<variation>Mode101</variation>
</variations>
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) \
-Xdump:dynamic \
-Dremote.server.option=$(Q)$(JVM_OPTIONS) -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false$(Q) \
Expand Down Expand Up @@ -1163,8 +1161,6 @@
<variation>Mode101</variation>
</variations>
<command>$(ADD_JVM_LIB_DIR_TO_LIBPATH) \
$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) \
-Xdump:dynamic \
-Dremote.server.option=$(Q)$(JVM_OPTIONS) -Dcom.sun.management.jmxremote.port=9999 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false$(Q) \
Expand Down
24 changes: 6 additions & 18 deletions test/functional/Java8andUp/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,9 +688,7 @@
<variation>NoOptions</variation>
<variation>-XX:RecreateClassfileOnload</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
-Drowset.provider.classname=org.openj9.resources.classloader.CustomSyncProvider \
--add-modules openj9.sharedclasses $(ADD_MODULE_JAVA_SE_EE) \
--add-exports java.base/com.ibm.tools.attach.target=ALL-UNNAMED \
Expand Down Expand Up @@ -743,9 +741,7 @@
<variation>NoOptions</variation>
<variation>-XX:RecreateClassfileOnload</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xdump:none -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xdump:none -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
-Drowset.provider.classname=org.openj9.resources.classloader.CustomSyncProvider \
--add-modules openj9.sharedclasses $(ADD_MODULE_JAVA_SE_EE) \
--add-exports java.base/com.ibm.tools.attach.target=ALL-UNNAMED \
Expand Down Expand Up @@ -784,9 +780,7 @@
<variation>NoOptions</variation>
<variation>-XX:RecreateClassfileOnload</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(P)$(TEST_RESROOT)$(D)TestResources.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
-Drowset.provider.classname=org.openj9.resources.classloader.CustomSyncProvider \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) \
Expand Down Expand Up @@ -827,9 +821,7 @@
<variation>NoOptions</variation>
<variation>-XX:RecreateClassfileOnload</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xdump:none -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -Xdump:none -verbose:stacktrace -Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)java.policy$(Q) \
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(P)$(TEST_RESROOT)$(D)TestResources.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
-Drowset.provider.classname=org.openj9.resources.classloader.CustomSyncProvider \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) \
Expand Down Expand Up @@ -917,9 +909,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace \
-Djava.security.policy=$(Q)$(TEST_RESROOT)$(D)testacc.policy$(Q) \
-Xbootclasspath/a:$(TEST_RESROOT)$(D)TestResources.jar \
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(TEST_RESROOT)$(D)GeneralTest.jar$(P)$(TEST_RESROOT)$(D)TestResources.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(Q) \
Expand Down Expand Up @@ -948,9 +938,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -verbose:stacktrace \
--add-modules openj9.sharedclasses $(ADD_MODULE_JAVA_SE_EE) \
--add-exports java.base/com.ibm.tools.attach.target=ALL-UNNAMED \
--add-exports java.base/com.ibm.oti.vm=ALL-UNNAMED \
Expand Down
4 changes: 2 additions & 2 deletions test/functional/Java9andUp/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
--module-path $(Q)$(TEST_RESROOT)$(D)module_bin$(Q) \
--add-modules org.openj9test.modularity.testerModule \
-Dorg.openj9.test.module.path=$(Q)$(TEST_RESROOT)$(D)module_bin$(Q) \
org.testng.TestNG methodvisibilitytests.xml \
org.testng.TestNG $(Q)$(TEST_RESROOT)$(D)methodvisibilitytests.xml$(Q) \
-testnames MethodVisibilityTests \
-groups $(TEST_GROUP) \
-excludegroups $(DEFAULT_EXCLUDE); \
Expand All @@ -62,7 +62,7 @@
--add-exports org.openj9test.modularity.testUnreflect/org.openj9.test.modularity.tests=ALL-UNNAMED \
--add-exports org.openj9test.modularity.dummy/org.openj9.test.modularity.dummy=ALL-UNNAMED \
--add-reads org.openj9test.modularity.testUnreflect=ALL-UNNAMED \
org.testng.TestNG testUnreflect.xml \
org.testng.TestNG $(Q)$(TEST_RESROOT)$(D)testUnreflect.xml$(Q) \
-testnames UnreflectTests \
-groups $(TEST_GROUP) \
-excludegroups $(DEFAULT_EXCLUDE); \
Expand Down
8 changes: 2 additions & 6 deletions test/functional/Jsr335/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
<variation>Mode301</variation>
<variation>Mode501</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)junit4.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(P)$(TEST_RESROOT)$(D)Jsr335.jar$(P).$(Q) \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames jsr335 \
-groups $(TEST_GROUP) \
Expand All @@ -60,9 +58,7 @@
<variation>Mode301</variation>
<variation>Mode501</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
-cp $(Q)$(RESOURCES_DIR)$(P)$(TESTNG)$(P)$(LIB_DIR)$(D)junit4.jar$(P)$(LIB_DIR)$(D)asm-all.jar$(P)$(TEST_RESROOT)$(D)Jsr335.jar$(P).$(Q) \
org.testng.TestNG -d $(REPORTDIR) $(Q)$(TEST_RESROOT)$(D)testng.xml$(Q) -testnames jsr335 \
-groups $(TEST_GROUP) \
Expand Down
16 changes: 4 additions & 12 deletions test/functional/cmdLineTests/URLClassLoaderTests/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(CD) $(REPORTDIR); \
cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DJAVA_HOME='$(JDK_HOME)' -DPATHSEP=$(Q)$(D)$(Q) -DRUN_SCRIPT=$(RUN_SCRIPT) -DSCRIPT_SUFFIX=$(SCRIPT_SUFFIX) -DEXECUTABLE_SUFFIX=$(EXECUTABLE_SUFFIX) -DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DCPDL=$(Q)$(P)$(Q) -DSCMODE=210 -DTEST_JVM_OPTIONS=$(Q)$(JVM_OPTIONS)$(Q) \
-jar $(CMDLINETESTER_JAR) \
Expand All @@ -56,9 +54,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(CD) $(REPORTDIR); \
cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DJAVA_HOME='$(JDK_HOME)' -DPATHSEP=$(Q)$(D)$(Q) -DRUN_SCRIPT=$(RUN_SCRIPT) -DSCRIPT_SUFFIX=$(SCRIPT_SUFFIX) -DEXECUTABLE_SUFFIX=$(EXECUTABLE_SUFFIX) -DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DCPDL=$(Q)$(P)$(Q) -DSCMODE=210 -DTEST_JVM_OPTIONS=$(Q)$(JVM_OPTIONS)$(Q) \
-jar $(CMDLINETESTER_JAR) \
Expand All @@ -85,9 +81,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(CD) $(REPORTDIR); \
cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DJAVA_HOME='$(JDK_HOME)' -DPATHSEP=$(Q)$(D)$(Q) -DRUN_SCRIPT=$(RUN_SCRIPT) -DSCRIPT_SUFFIX=$(SCRIPT_SUFFIX) -DEXECUTABLE_SUFFIX=$(EXECUTABLE_SUFFIX) -DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DCPDL=$(Q)$(P)$(Q) -DSCMODE=210 -DTEST_JVM_OPTIONS=$(Q)$(JVM_OPTIONS)$(Q) \
-jar $(CMDLINETESTER_JAR) \
Expand All @@ -112,9 +106,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(CD) $(REPORTDIR); \
cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
<command>cp -r $(Q)$(TEST_RESROOT)$(D)URLClassLoaderTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar$(EXECUTABLE_SUFFIX)$(Q) -xf URLClassLoaderTests.jar; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DJAVA_HOME='$(JDK_HOME)' -DPATHSEP=$(Q)$(D)$(Q) -DRUN_SCRIPT=$(RUN_SCRIPT) -DSCRIPT_SUFFIX=$(SCRIPT_SUFFIX) -DEXECUTABLE_SUFFIX=$(EXECUTABLE_SUFFIX) -DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DCPDL=$(Q)$(P)$(Q) -DSCMODE=211 -DTEST_JVM_OPTIONS=$(Q)$(JVM_OPTIONS)$(Q) \
-jar $(CMDLINETESTER_JAR) \
Expand Down
12 changes: 3 additions & 9 deletions test/functional/cmdLineTests/callsitedbgddrext/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xint \
-DUTILSJAR=$(Q)$(JVM_TEST_ROOT)$(D)functional$(D)cmdLineTests$(D)utils$(D)utils.jar$(Q) \
-DRESJAR=$(CMDLINETESTER_RESJAR) -DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down Expand Up @@ -58,9 +56,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xint \
-DUTILSJAR=$(Q)$(JVM_TEST_ROOT)$(D)functional$(D)cmdLineTests$(D)utils$(D)utils.jar$(Q) \
-DRESJAR=$(CMDLINETESTER_RESJAR) -DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down Expand Up @@ -89,9 +85,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xint \
-DUTILSJAR=$(Q)$(JVM_TEST_ROOT)$(D)functional$(D)cmdLineTests$(D)utils$(D)utils.jar$(Q) \
-DRESJAR=$(CMDLINETESTER_RESJAR) -DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down
12 changes: 3 additions & 9 deletions test/functional/cmdLineTests/classesdbgddrext/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl zos ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xmx1G \
-DRESJAR=$(CMDLINETESTER_RESJAR) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down Expand Up @@ -62,9 +60,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xmx1G \
-DRESJAR=$(CMDLINETESTER_RESJAR) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down Expand Up @@ -96,9 +92,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl aix ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl aix ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xmx1G \
-DRESJAR=$(CMDLINETESTER_RESJAR) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down
8 changes: 2 additions & 6 deletions test/functional/cmdLineTests/gcRegressionTests/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
<variation>Mode551</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DTESTSJARPATH=$(Q)$(TEST_RESROOT)$(D)gcRegressionTests.jar$(Q) -DRESJAR=$(CMDLINETESTER_RESJAR) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -DTESTSJARPATH=$(Q)$(TEST_RESROOT)$(D)gcRegressionTests.jar$(Q) -DRESJAR=$(CMDLINETESTER_RESJAR) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -Xint -jar $(CMDLINETESTER_JAR) -config $(Q)$(TEST_RESROOT)$(D)gcRegressionTests.xml$(Q) \
-verbose -explainExcludes -xids all,$(PLATFORM),$(VARIATION) -plats all,$(PLATFORM),$(VARIATION) -xlist $(Q)$(TEST_RESROOT)$(D)gcRegressionTests_excludes.xml$(Q) -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
Expand All @@ -55,9 +53,7 @@
<variations>
<variation>Mode301</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DTESTSJARPATH=$(Q)$(TEST_RESROOT)$(D)gcRegressionTests.jar$(Q) -DRESJAR=$(CMDLINETESTER_RESJAR) -DTESTOUTPUT=$(TESTOUTPUT) \
<command>$(JAVA_COMMAND) $(JVM_OPTIONS) -DTESTSJARPATH=$(Q)$(TEST_RESROOT)$(D)gcRegressionTests.jar$(Q) -DRESJAR=$(CMDLINETESTER_RESJAR) -DTESTOUTPUT=$(TESTOUTPUT) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -Xint -jar $(CMDLINETESTER_JAR) -config $(Q)$(TEST_RESROOT)$(D)gcRegressionTests.xml$(Q) \
-verbose -explainExcludes -xids all,$(PLATFORM),Mode301 -plats all,$(PLATFORM),Mode301 -xlist $(Q)$(TEST_RESROOT)$(D)gcRegressionTests_excludes.xml$(Q) -explainExcludes -nonZeroExitWhenError; \
$(TEST_STATUS)</command>
Expand Down
4 changes: 1 addition & 3 deletions test/functional/cmdLineTests/modularityddrtests/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
cd $(REPORTDIR); \
perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all ; \
<command>perl $(JVM_TEST_ROOT)$(D)TestConfig$(D)scripts$(D)tools$(D)sysvcleanup.pl all ; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -Xmx1G \
-DRESJAR=$(CMDLINETESTER_RESJAR) \
-DEXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' \
Expand Down
Loading