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

Exclude jdi test and mauve multi thread load test from systemtest builds #212

Merged
merged 2 commits into from
Jan 11, 2018
Merged

Exclude jdi test and mauve multi thread load test from systemtest builds #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b52d91
Added new tag external, system, jck
Mesbah-Alam Jan 11, 2018
3bde5b0
Issue 63 and 64 : Exclude JDITest and MauveMultiThreadLoadTest from
Mesbah-Alam Jan 11, 2018
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
18 changes: 17 additions & 1 deletion TestConfig/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,23 @@ openjdk: rmResultFile openjdk_$(JAVA_VERSION) resultsSummary
perf: JVM_TEST_ROOT := $(BUILD_ROOT)
perf: rmResultFile perf_$(JAVA_VERSION) resultsSummary

runtest: rmResultFile sanity_$(JAVA_VERSION) extended_$(JAVA_VERSION) openjdk_$(JAVA_VERSION) perf_$(JAVA_VERSION) resultsSummary
system: JVM_TEST_ROOT := $(BUILD_ROOT)
system: rmResultFile system_$(JAVA_VERSION) resultsSummary

jck: JVM_TEST_ROOT := $(BUILD_ROOT)
jck: rmResultFile jck_$(JAVA_VERSION) resultsSummary

external: JVM_TEST_ROOT := $(BUILD_ROOT)
external: rmResultFile external_$(JAVA_VERSION) resultsSummary

hotspot: JVM_TEST_ROOT := $(BUILD_ROOT)
hotspot: rmResultFile hotspot_$(JAVA_VERSION) resultsSummary

openj9: JVM_TEST_ROOT := $(BUILD_ROOT)
openj9: rmResultFile openj9_$(JAVA_VERSION) resultsSummary


runtest: rmResultFile sanity_$(JAVA_VERSION) extended_$(JAVA_VERSION) openjdk_$(JAVA_VERSION) perf_$(JAVA_VERSION) system_$(JAVA_VERSION) jck_$(JAVA_VERSION) external_$(JAVA_VERSION) resultsSummary
.NOTPARALLEL: extended sanity openjdk runtest rmResultFile resultsSummary

# cleanup
Expand Down
2 changes: 1 addition & 1 deletion TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

use constant DEBUG => 0;

my @allGroups = ( "sanity", "extended", "promotion", "openjdk", "system", "jck", "perf" );
my @allGroups = ( "sanity", "extended", "promotion", "openjdk", "system", "jck", "perf", "external", "hotspot", "openj9" );

my $headerComments =
"########################################################\n"
Expand Down
44 changes: 44 additions & 0 deletions systemtest/exclude_playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,48 @@
<subset>SE90</subset>
</subsets>
</test>

<test>
<testCaseName>JdiTest</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>export JAVA_HOME=$(JDK_HOME)$(D) && \
perl $(TEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl \
-test-root=$(Q)$(TEST_RESROOT)$(D)stf;$(TEST_RESROOT)$(D)openjdk-systemtest$(Q) \
-systemtest-prereqs=$(Q)$(TEST_RESROOT)$(D)systemtest_prereqs$(Q) \
-results-root=$(REPORTDIR) \
-test=JdiTest; \
$(TEST_STATUS)</command>
<tags>
<tag>system</tag>
</tags>
<subsets>
<subset>SE80</subset>
<subset>SE90</subset>
</subsets>
</test>


<test>
<testCaseName>MauveMultiThreadLoadTest</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>export JAVA_HOME=$(JDK_HOME)$(D) && \
perl $(TEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl \
-test-root=$(Q)$(TEST_RESROOT)$(D)stf;$(TEST_RESROOT)$(D)openjdk-systemtest$(Q) \
-systemtest-prereqs=$(Q)$(TEST_RESROOT)$(D)systemtest_prereqs$(Q) \
-results-root=$(REPORTDIR) \
-test=MauveMultiThreadLoadTest; \
$(TEST_STATUS)</command>
<tags>
<tag>system</tag>
</tags>
<subsets>
<subset>SE80</subset>
<subset>SE90</subset>
</subsets>
</test>

</playlist>
42 changes: 1 addition & 41 deletions systemtest/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,27 +213,6 @@
</subsets>
</test>

<test>
<testCaseName>MauveMultiThreadLoadTest</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>export JAVA_HOME=$(JDK_HOME)$(D) && \
perl $(TEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl \
-test-root=$(Q)$(TEST_RESROOT)$(D)stf;$(TEST_RESROOT)$(D)openjdk-systemtest$(Q) \
-systemtest-prereqs=$(Q)$(TEST_RESROOT)$(D)systemtest_prereqs$(Q) \
-results-root=$(REPORTDIR) \
-test=MauveMultiThreadLoadTest; \
$(TEST_STATUS)</command>
<tags>
<tag>system</tag>
</tags>
<subsets>
<subset>SE80</subset>
<subset>SE90</subset>
</subsets>
</test>

<test>
<testCaseName>NioLoadTest</testCaseName>
<variations>
Expand Down Expand Up @@ -297,25 +276,6 @@
</subsets>
</test>

<test>
<testCaseName>JdiTest</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>export JAVA_HOME=$(JDK_HOME)$(D) && \
perl $(TEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl \
-test-root=$(Q)$(TEST_RESROOT)$(D)stf;$(TEST_RESROOT)$(D)openjdk-systemtest$(Q) \
-systemtest-prereqs=$(Q)$(TEST_RESROOT)$(D)systemtest_prereqs$(Q) \
-results-root=$(REPORTDIR) \
-test=JdiTest; \
$(TEST_STATUS)</command>
<tags>
<tag>system</tag>
</tags>
<subsets>
<subset>SE80</subset>
<subset>SE90</subset>
</subsets>
</test>


</playlist>
2 changes: 1 addition & 1 deletion thirdparty_containers/scala/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<subset>SE90</subset>
</subsets>
<tags>
<tag>extended</tag>
<tag>external</tag>
</tags>
</test>
</playlist>