Skip to content

Commit

Permalink
Remove --add-modules jdk.incubator.foreign for JDK19
Browse files Browse the repository at this point in the history
Depends on: eclipse-openj9/openj9#15091
Related: eclipse-openj9/openj9#15162

Signed-off-by: lanxia <lan_xia@ca.ibm.com>
  • Loading branch information
llxia committed Jun 1, 2022
1 parent 254a772 commit 2808c8e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions openjdk/openjdk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,10 @@ endif
VENDOR_PROBLEM_LIST_FILE:=
ifneq (,$(findstring Red Hat,$(JDK_VENDOR)))
VENDOR_PROBLEM_LIST_FILE:=-exclude:$(Q)$(TEST_ROOT)$(D)openjdk$(D)excludes$(D)vendors$(D)redhat$(D)ProblemList_openjdk$(JDK_VERSION).txt$(Q)
endif

# --add-modules jdk.incubator.foreign is removed for JDK19+
ADD_MODULES=
ifneq ($(filter 16 17 18, $(JDK_VERSION)),)
ADD_MODULES=--add-modules jdk.incubator.foreign
endif
4 changes: 2 additions & 2 deletions openjdk/playlist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@
<variation>Mode1000</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 --add-modules jdk.incubator.foreign $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(ADD_MODULES) $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
Expand Down Expand Up @@ -1311,7 +1311,7 @@
<variation>Mode1000</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 --add-modules jdk.incubator.foreign $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(ADD_MODULES) $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
-jdk:$(Q)$(TEST_JDK_HOME)$(Q) \
Expand Down

0 comments on commit 2808c8e

Please sign in to comment.