Merge pull request #2930 from renfeiw/tkg6

Temporarily support both JAVA_IMPL and JDK_IMPL

test/TestConfig/settings.mk

@@ -55,6 +55,7 @@ else
 export SPEC:=$(SPEC)
 endif
 
+# temporarily support both JAVA_VERSION and JDK_VERSION
 ifeq ($(JAVA_VERSION), SE80)
 	JDK_VERSION:=8
 endif
@@ -69,13 +70,20 @@ ifeq ($(JAVA_VERSION), SE110)
 endif
 
 ifndef JDK_VERSION
-export JDK_VERSION:=8
+	export JDK_VERSION:=8
 else
-export JDK_VERSION:=$(JDK_VERSION)
+	export JDK_VERSION:=$(JDK_VERSION)
 endif
 
+# temporarily support both JAVA_IMPL and JDK_IMPL
 ifndef JDK_IMPL
-export JDK_IMPL:=openj9
+	JDK_IMPL=$(JAVA_IMPL)
+endif
+
+ifndef JDK_IMPL
+	export JDK_IMPL:=openj9
+else
+	export JDK_IMPL:=$(JDK_IMPL)
 endif
 
 ifndef JVM_VERSION
@@ -92,10 +100,10 @@ ifeq ($(JDK_VERSION), 11)
 	OPENJDK_VERSION = openjdk11
 endif
 
-ifeq (hotspot, $(JAVA_IMPL))
+ifeq (hotspot, $(JDK_IMPL))
 	JVM_VERSION = $(OPENJDK_VERSION)
 else 
-	JVM_VERSION = $(OPENJDK_VERSION)-$(JAVA_IMPL)
+	JVM_VERSION = $(OPENJDK_VERSION)-$(JDK_IMPL)
 endif
 
 export JVM_VERSION:=$(JVM_VERSION)

test/functional/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml

@@ -75,7 +75,7 @@
 	-DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DJAVA_HOME='$(JDK_HOME)' -DSCMODE=204 -DJVM_TEST_ROOT=$(Q)$(JVM_TEST_ROOT)$(Q) \
 	-DUTILSJAR=$(Q)$(JVM_TEST_ROOT)$(D)functional$(D)cmdLineTests$(D)utils$(D)utils.jar$(Q) \
 	-jar $(CMDLINETESTER_JAR) \
-	-config $(Q)$(TEST_RESROOT)$(D)ShareClassesCMLTests-1.xml$(Q) -xids all,$(PLATFORM),$(VARIATION),$(JDK_VERSION),$(JAVA_IMPL) -plats all,$(PLATFORM),$(VARIATION),$(JDK_VERSION)_$(BITS) -xlist $(Q)$(TEST_RESROOT)$(D)exclude_openj9.xml$(Q) \
+	-config $(Q)$(TEST_RESROOT)$(D)ShareClassesCMLTests-1.xml$(Q) -xids all,$(PLATFORM),$(VARIATION),$(JDK_VERSION),$(JDK_IMPL) -plats all,$(PLATFORM),$(VARIATION),$(JDK_VERSION)_$(BITS) -xlist $(Q)$(TEST_RESROOT)$(D)exclude_openj9.xml$(Q) \
 	-nonZeroExitWhenError \
 	-outputLimit 300; \
 	$(TEST_STATUS)</command>