Skip to content

Commit

Permalink
Add --enable-preview to criu nonPortable test in Valhalla build
Browse files Browse the repository at this point in the history
closes #20627

Signed-off-by: Hang Shao <[email protected]>
  • Loading branch information
hangshao0 committed Dec 3, 2024
1 parent f5f557e commit 5224db5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</test>

<test id="jdk.crac - jcmd request checkpoint via JDK.checkpoint">
<command>bash $SCRIPPATH$ $TEST_RESROOT$ $JAVA_COMMAND$ "$JVM_OPTIONS$ $EXPORTS$ $CRACCHECKPOINTTO$" $TESTNG$ $MAINCLASS_TESTJDKCRAC$ JDK.checkpoint 1 false false</command>
<command>bash $SCRIPPATH$ $TEST_RESROOT$ $JAVA_COMMAND$ "$ENABLE_PREVIEW$ $JVM_OPTIONS$ $EXPORTS$ $CRACCHECKPOINTTO$" $TESTNG$ $MAINCLASS_TESTJDKCRAC$ JDK.checkpoint 1 false false</command>
<output type="success" caseSensitive="no" regex="no">JVM checkpoint requested</output>
<output type="failure" caseSensitive="yes" regex="no">CRIU is not enabled</output>
<output type="failure" caseSensitive="yes" regex="no">Operation not permitted</output>
Expand Down
2 changes: 1 addition & 1 deletion test/functional/cmdLineTests/criu/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<command>
$(JAVA_COMMAND) $(CMDLINETESTER_JVM_OPTIONS) -Xdump \
-DSCRIPPATH=$(TEST_RESROOT)$(D)cracScript.sh -DTEST_RESROOT=$(TEST_RESROOT) \
-DJAVA_COMMAND=$(JAVA_COMMAND) -DJVM_OPTIONS=$(Q)$(JVM_OPTIONS)$(Q) -DTESTNG=$(TESTNG) \
-DJAVA_COMMAND=$(JAVA_COMMAND) -DENABLE_PREVIEW=$(ENABLE_PREVIEW) -DJVM_OPTIONS=$(Q)$(JVM_OPTIONS)$(Q) -DTESTNG=$(TESTNG) \
-jar $(CMDLINETESTER_JAR) -config $(Q)$(TEST_RESROOT)$(D)criu_nonPortable_jdk_crac.xml$(Q) \
-explainExcludes -xids all,$(PLATFORM),$(VARIATION) -nonZeroExitWhenError; \
$(TEST_STATUS)
Expand Down
7 changes: 7 additions & 0 deletions test/functional/cmdLineTests/variables.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,10 @@
ifneq ($(filter openj9 ibm, $(JDK_IMPL)),)
CMDLINETESTER_JVM_OPTIONS=$(Q)-Xshareclasses:none$(Q)
endif

# Set ENABLE_PREVIEW to --enable-preview when testing a Valhalla build.
ifeq ($(findstring VTSTANDARD, $(TEST_FLAG)), VTSTANDARD)
ENABLE_PREVIEW=--enable-preview
else
ENABLE_PREVIEW=
endif

0 comments on commit 5224db5

Please sign in to comment.