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 APPLICATION_OPTIONS as a test job parameter #4140

Merged
merged 1 commit into from
Nov 11, 2022
Merged

Add APPLICATION_OPTIONS as a test job parameter #4140

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
9 changes: 6 additions & 3 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def setupEnv() {
env.TEST_JDK_HOME = "$WORKSPACE/openjdkbinary/j2sdk-image"
env.JVM_VERSION = params.JVM_VERSION ? params.JVM_VERSION : ""
env.JVM_OPTIONS = params.JVM_OPTIONS ? params.JVM_OPTIONS : ""
env.APPLICATION_OPTIONS = params.APPLICATION_OPTIONS ? params.APPLICATION_OPTIONS : ""
env.EXTRA_DOCKER_ARGS = params.EXTRA_DOCKER_ARGS ? params.EXTRA_DOCKER_ARGS : ""
env.OPENJDK_SHA = params.OPENJDK_SHA ? params.OPENJDK_SHA : ""
env.TEST_FLAG = params.TEST_FLAG ? params.TEST_FLAG : ''
Expand Down Expand Up @@ -638,7 +639,7 @@ def checkTestResults() {
def results = [:]
def summary = null

def matcher = manager.getLogMatcher(".*(TOTAL: \\d+) (EXECUTED: \\d+) (PASSED: \\d+) (FAILED: \\d+) (DISABLED: \\d+) (SKIPPED: \\d+).*")
def matcher = manager.getLogMatcher(".*(TOTAL: \\d+)\\s*(EXECUTED: \\d+)\\s*(PASSED: \\d+)\\s*(FAILED: \\d+)\\s*(DISABLED: \\d+)?\\s*(SKIPPED: \\d+).*")
if (!matcher?.matches()) {
currentBuild.result = 'FAILURE'
echo 'Could not find test result, set build result to FAILURE.'
Expand All @@ -648,8 +649,10 @@ def checkTestResults() {
}

for (int i = 1; i < matcher.groupCount(); i++) {
def matchVals = matcher.group(i).split(": ")
results[matchVals[0]] = matchVals[1]
if (matcher.group(i) != null) {
def matchVals = matcher.group(i).split(": ")
results[matchVals[0]] = matchVals[1]
}
}

if (results["TOTAL"].equals("0")) {
Expand Down
1 change: 1 addition & 0 deletions buildenv/jenkins/testJobTemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ ARCH_OS_LIST.each { ARCH_OS ->
choiceParam('TEST_FLAG', ['', 'JITAAS', 'AOT', 'FIPS'], "Optional. Only set for feature testing. (i.e., JITAAS, AOT, FIPS, etc)")
stringParam('EXTRA_OPTIONS', "", "Use this to append options to the test command")
stringParam('JVM_OPTIONS', "", "Use this to replace the test original command line options")
stringParam('APPLICATION_OPTIONS', "", "Use this to append options to the test application")
stringParam('BUILD_IDENTIFIER', "", "build identifier")
stringParam('ITERATIONS',"1", '''Optional. Number of times to repeat execution of make target. <br/>
Use ITERATIONS with PARALLEL=None, run the same test(s) in a loop on one machine <br/>
Expand Down
7 changes: 6 additions & 1 deletion jck/jck.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,17 @@ ifeq (,$(findstring testsuite, $(JCK_CUSTOM_TARGET)))
override JCK_CUSTOM_TARGET := $(JCK_CUSTOM_TARGET) testsuite=RUNTIME
endif

# Additional JavaTestRunner options can be added via APPLICATION_OPTIONS
ifndef APPLICATION_OPTIONS
APPLICATION_OPTIONS :=
endif

JCK_CMD_TEMPLATE = $(JAVA_COMMAND)
ifeq ($(USE_JRE),1)
JCK_CMD_TEMPLATE = $(JRE_COMMAND)
endif

JCK_CMD_TEMPLATE += -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavaTestRunner resultsRoot=$(REPORTDIR) testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH)
JCK_CMD_TEMPLATE += -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavaTestRunner resultsRoot=$(REPORTDIR) testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH) $(APPLICATION_OPTIONS)

VERIFIER_INSTRUCTIONS_TESTS_GROUP1=$(Q)vm/verifier/instructions/aaload;vm/verifier/instructions/aastore;vm/verifier/instructions/anewarray;vm/verifier/instructions/areturn;vm/verifier/instructions/baload;vm/verifier/instructions/bastore;vm/verifier/instructions/bipush;vm/verifier/instructions/caload;vm/verifier/instructions/castore;vm/verifier/instructions/d2f;vm/verifier/instructions/d2i;vm/verifier/instructions/d2l;vm/verifier/instructions/dadd;vm/verifier/instructions/daload;vm/verifier/instructions/dastore;vm/verifier/instructions/dcmp;vm/verifier/instructions/dconst;vm/verifier/instructions/ddiv;vm/verifier/instructions/dmul;vm/verifier/instructions/dneg;vm/verifier/instructions/drem;vm/verifier/instructions/dreturn;vm/verifier/instructions/dsub;vm/verifier/instructions/dup;vm/verifier/instructions/dup2$(Q)
VERIFIER_INSTRUCTIONS_TESTS_GROUP2=$(Q)vm/verifier/instructions/dup2x1;vm/verifier/instructions/dup2x2;vm/verifier/instructions/dupx1;vm/verifier/instructions/dupx2;vm/verifier/instructions/f2d;vm/verifier/instructions/f2i;vm/verifier/instructions/f2l;vm/verifier/instructions/fadd;vm/verifier/instructions/faload;vm/verifier/instructions/fastore;vm/verifier/instructions/fcmp;vm/verifier/instructions/fconst;vm/verifier/instructions/fdiv;vm/verifier/instructions/fmul;vm/verifier/instructions/fneg;vm/verifier/instructions/frem;vm/verifier/instructions/freturn;vm/verifier/instructions/fsub;vm/verifier/instructions/getfield;vm/verifier/instructions/getstatic;vm/verifier/instructions/i2b;vm/verifier/instructions/i2c;vm/verifier/instructions/i2d;vm/verifier/instructions/i2f;vm/verifier/instructions/i2l$(Q)
Expand Down
6 changes: 4 additions & 2 deletions system/system.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ ifeq (,$(findstring $(JDK_IMPL),hotspot))
JAVA_ARGS += -Xdump:system:events=user
endif

APPLICATION_OPTIONS :=
ifndef APPLICATION_OPTIONS
APPLICATION_OPTIONS :=
endif
ifdef JVM_OPTIONS
APPLICATION_OPTIONS := -jvmArgs $(Q)$(JVM_OPTIONS)$(Q)
APPLICATION_OPTIONS := $(APPLICATION_OPTIONS) -jvmArgs $(Q)$(JVM_OPTIONS)$(Q)
endif

define SYSTEMTEST_CMD_TEMPLATE
Expand Down