Include vendor's problem list only if there is one

Signed-off-by: Sophia Guo <[email protected]>
adoptium · Sep 27, 2023 · aa0e933 · aa0e933
1 parent d6373e7
commit aa0e933
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/openjdk/build.xml b/openjdk/build.xml
@@ -72,7 +72,7 @@
 			<!-- version 21 -->
 			<matches pattern="^21$" string="${JDK_VERSION}"/>
 			<then>
-				<property name="jtregTar" value="jtreg_7_2_1"/>
+				<property name="jtregTar" value="jtreg_7_3_1_1"/>
 			</then>
 		</elseif>
 		<elseif>

diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
@@ -198,7 +198,10 @@ endif
 
 VENDOR_PROBLEM_LIST_FILE:=
 ifeq ($(JDK_VENDOR),$(filter $(JDK_VENDOR),redhat azul alibaba microsoft))
-	VENDOR_PROBLEM_LIST_FILE:=-exclude:$(Q)$(TEST_ROOT)$(D)openjdk$(D)excludes$(D)vendors$(D)$(JDK_VENDOR)$(D)ProblemList_openjdk$(JDK_VERSION).txt$(Q)
+	VENDOR_FILE:=excludes$(D)vendors$(D)$(JDK_VENDOR)$(D)ProblemList_openjdk$(JDK_VERSION).txt
+	ifneq (,$(wildcard $(VENDOR_FILE)))
+		VENDOR_PROBLEM_LIST_FILE:=-exclude:$(Q)$(TEST_ROOT)$(D)openjdk$(D)$(VENDOR_FILE)$(Q)
+	endif
 endif
 
 # --add-modules jdk.incubator.foreign is removed for JDK19+