From 1fcc351e28c1d70e4bb13c993267eb5102d4b6a3 Mon Sep 17 00:00:00 2001 From: lanxia Date: Thu, 7 Feb 2019 10:27:20 -0500 Subject: [PATCH] Add JAVA_VERSION to JDK_VERSION mapping for Java12 Fixes: #4638 [ci skip] Signed-off-by: lanxia --- test/TestConfig/run_configure.mk | 3 +++ test/TestConfig/settings.mk | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/test/TestConfig/run_configure.mk b/test/TestConfig/run_configure.mk index 1bc4b215111..a2cdab22f0d 100644 --- a/test/TestConfig/run_configure.mk +++ b/test/TestConfig/run_configure.mk @@ -54,6 +54,9 @@ endif ifeq ($(JAVA_VERSION), SE110) JDK_VERSION:=11 endif +ifeq ($(JAVA_VERSION), SE120) + JDK_VERSION:=12 +endif ifndef JDK_VERSION export JDK_VERSION:=8 diff --git a/test/TestConfig/settings.mk b/test/TestConfig/settings.mk index d30a7e0a761..4c4e0350d71 100644 --- a/test/TestConfig/settings.mk +++ b/test/TestConfig/settings.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2016, 2018 IBM Corp. and others +# Copyright (c) 2016, 2019 IBM Corp. and others # # This program and the accompanying materials are made available under # the terms of the Eclipse Public License 2.0 which accompanies this @@ -70,6 +70,9 @@ endif ifeq ($(JAVA_VERSION), SE110) JDK_VERSION:=11 endif +ifeq ($(JAVA_VERSION), SE120) + JDK_VERSION:=12 +endif ifndef JDK_VERSION export JDK_VERSION:=8 @@ -102,6 +105,9 @@ endif ifeq ($(JDK_VERSION), 11) OPENJDK_VERSION = openjdk11 endif +ifeq ($(JDK_VERSION), 12) + OPENJDK_VERSION = openjdk12 +endif ifeq (hotspot, $(JDK_IMPL)) JVM_VERSION = $(OPENJDK_VERSION)