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

Jump to bottom

Add a custom playlist target to run system tests #2234

Merged
merged 1 commit into from
Feb 6, 2021
Merged

Add a custom playlist target to run system tests #2234

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
6 changes: 5 additions & 1 deletion buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,11 @@ def runTest( ) {

TARGET = "${params.TARGET}";
if (TARGET.contains('custom') && CUSTOM_TARGET!='') {
CUSTOM_OPTION = "${TARGET.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
if (TARGET == 'system_custom') {
env.SYSTEM_CUSTOM_TARGET=CUSTOM_TARGET
} else {
CUSTOM_OPTION = "${TARGET.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
}
}
if (!TARGET.startsWith('-f')) {
TARGET="_${params.TARGET}"
Expand Down
14 changes: 14 additions & 0 deletions system/otherLoadTest/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@
<group>system</group>
</groups>
</test>
<test>
<testCaseName>system_custom</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(SYSTEMTEST_CMD_TEMPLATE) $(CUSTOM_TARGET);\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to set a default value for CUSTOM_TARGET . Otherwise, the build without CUSTOM_TARGET (i.e., regular build) will fail.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah.. that was missed.

Added!

Ran some more tests with the default value:

When CUSTOM_TARGET field is empty : https://ci.adoptopenjdk.net/view/Test_grinder/job/Grinder/6495/console
When CUSTOM_TARGET has a value given by user: https://ci.adoptopenjdk.net/view/Test_grinder/job/Grinder/6496/console

They look all good.

$(TEST_STATUS)</command>
<levels>
<level>special</level>
</levels>
<groups>
<group>system</group>
</groups>
</test>
<test>
<testCaseName>MiniMix_5m</testCaseName>
<variations>
Expand Down
3 changes: 3 additions & 0 deletions system/systemtest.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ perl $(SYSTEMTEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl \
-java-args=$(SQ)$(JVM_OPTIONS)$(SQ) \
-results-root=$(REPORTDIR)
endef

# Default test to be run for system_custom in regular system test builds
CUSTOM_TARGET ?= -test=ClassloadingLoadTest