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

Add hotspot_container and jdk_container test groups #4147

Merged
merged 1 commit into from
Nov 23, 2022
Merged

Add hotspot_container and jdk_container test groups #4147

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
7 changes: 7 additions & 0 deletions openjdk/openjdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ ifneq ($(JDK_VERSION),8)
endif
endif

# Suitable values: 'docker' or 'podman'
CONTAINER_TEST_ENGINE=docker
# Run container tests on latest UBI 8 base image
OPENJDK_CONTAINER_TEST_OPTS:=-Djdk.test.docker.image.name=registry.access.redhat.com/ubi8/ubi -Djdk.test.docker.image.version=latest
ifneq ($(CONTAINER_TEST_ENGINE),docker)
OPENJDK_CONTAINER_TEST_OPTS += -Djdk.test.container.command=$(CONTAINER_TEST_ENGINE)
endif
PROBLEM_LIST_FILE:=excludes/ProblemList_openjdk$(JDK_VERSION).txt
PROBLEM_LIST_DEFAULT:=excludes/ProblemList_openjdk11.txt
TEST_VARIATION_DUMP:=
Expand Down
118 changes: 118 additions & 0 deletions openjdk/playlist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,124 @@
<impl>hotspot</impl>
</impls>
</test>
<test>
<testCaseName>hotspot_container</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-exclude:$(Q)$(JTREG_HOTSPOT_TEST_DIR)$(D)ProblemList.txt$(Q) \
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
${FEATURE_PROBLEM_LIST_FILE} \
${VENDOR_PROBLEM_LIST_FILE} \
${OPENJDK_CONTAINER_TEST_OPTS} \
$(Q)$(JTREG_HOTSPOT_TEST_DIR):hotspot_containers$(Q); \
$(TEST_STATUS)</command>
<versions>
<version>11+</version>
</versions>
<levels>
<level>dev</level>
</levels>
<groups>
<group>openjdk</group>
</groups>
<impls>
<impl>hotspot</impl>
</impls>
<platformRequirements>os.linux</platformRequirements>
</test>
<test>
<testCaseName>hotspot_container_jdk8</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-exclude:$(Q)$(JTREG_HOTSPOT_TEST_DIR)$(D)ProblemList.txt$(Q) \
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
${FEATURE_PROBLEM_LIST_FILE} \
${VENDOR_PROBLEM_LIST_FILE} \
${OPENJDK_CONTAINER_TEST_OPTS} \
$(Q)$(OPENJDK_DIR)$(D)hotspot$(D)test$(D)runtime$(D)containers$(Q); \
$(TEST_STATUS)</command>
<versions>
<version>8</version>
</versions>
<levels>
<level>dev</level>
</levels>
<groups>
<group>openjdk</group>
</groups>
<impls>
<impl>hotspot</impl>
</impls>
<platformRequirements>os.linux</platformRequirements>
</test>
<test>
<testCaseName>jdk_container</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList.txt$(Q) \
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
${FEATURE_PROBLEM_LIST_FILE} \
${VENDOR_PROBLEM_LIST_FILE} \
${OPENJDK_CONTAINER_TEST_OPTS} \
$(Q)$(OPENJDK_DIR)$(D)test$(D)jdk$(D)jdk$(D)internal$(D)platform$(Q); \
$(TEST_STATUS)</command>
<versions>
<version>11+</version>
</versions>
<levels>
<level>dev</level>
</levels>
<groups>
<group>openjdk</group>
</groups>
<platformRequirements>os.linux</platformRequirements>
</test>
<test>
<testCaseName>jdk_container_jdk8</testCaseName>
<variations>
<variation>NoOptions</variation>
</variations>
<command>$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
$(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
-exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList.txt$(Q) \
-exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \
${FEATURE_PROBLEM_LIST_FILE} \
${VENDOR_PROBLEM_LIST_FILE} \
${OPENJDK_CONTAINER_TEST_OPTS} \
$(Q)$(OPENJDK_DIR)$(D)jdk$(D)test$(D)jdk$(D)internal$(D)platform$(Q); \
$(TEST_STATUS)</command>
<versions>
<version>8</version>
</versions>
<levels>
<level>dev</level>
</levels>
<groups>
<group>openjdk</group>
</groups>
<platformRequirements>os.linux</platformRequirements>
</test>
<test>
<testCaseName>hotspot_compiler</testCaseName>
<variations>
Expand Down