Skip to content

Commit 42580aa

Browse files
authored
Add a custom playlist target to run system tests (#2234)
Signed-off-by: [email protected] <[email protected]>
1 parent 37c8801 commit 42580aa

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

buildenv/jenkins/JenkinsfileBase

+5-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,11 @@ def runTest( ) {
539539

540540
TARGET = "${params.TARGET}";
541541
if (TARGET.contains('custom') && CUSTOM_TARGET!='') {
542-
CUSTOM_OPTION = "${TARGET.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
542+
if (TARGET == 'system_custom') {
543+
env.SYSTEM_CUSTOM_TARGET=CUSTOM_TARGET
544+
} else {
545+
CUSTOM_OPTION = "${TARGET.toUpperCase()}_TARGET='${CUSTOM_TARGET}'"
546+
}
543547
}
544548
if (!TARGET.startsWith('-f')) {
545549
TARGET="_${params.TARGET}"

system/otherLoadTest/playlist.xml

+14
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@
1717
<group>system</group>
1818
</groups>
1919
</test>
20+
<test>
21+
<testCaseName>system_custom</testCaseName>
22+
<variations>
23+
<variation>NoOptions</variation>
24+
</variations>
25+
<command>$(SYSTEMTEST_CMD_TEMPLATE) $(CUSTOM_TARGET);\
26+
$(TEST_STATUS)</command>
27+
<levels>
28+
<level>special</level>
29+
</levels>
30+
<groups>
31+
<group>system</group>
32+
</groups>
33+
</test>
2034
<test>
2135
<testCaseName>MiniMix_5m</testCaseName>
2236
<variations>

system/systemtest.mk

+3
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,6 @@ perl $(SYSTEMTEST_RESROOT)$(D)stf$(D)stf.core$(D)scripts$(D)stf.pl \
5353
-java-args=$(SQ)$(JVM_OPTIONS)$(SQ) \
5454
-results-root=$(REPORTDIR)
5555
endef
56+
57+
# Default test to be run for system_custom in regular system test builds
58+
CUSTOM_TARGET ?= -test=ClassloadingLoadTest

0 commit comments

Comments
 (0)