Merge pull request #13225 from JasonFengJ9/semeru2-v027

(0.27.0) Recognize new product name Semeru
eclipse-openj9 · Jul 20, 2021 · 1851b00 · 1851b00
2 parents d1dff08 + 8786146
commit 1851b00
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 52 deletions.
diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-4.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-4.xml
@@ -697,7 +697,7 @@
 	<test id="Verify whether VM successfully runs in read-only shared cache with testBadBuildID and nonfatal option specified" timeout="600" runPath=".">
 		<command>$JAVA_EXE$ -Xint -Xshareclasses:testBadBuildID,verbose,readonly,nonfatal -version</command>
 		<output type="required" caseSensitive="yes" regex="no">Continue without using it as -Xshareclasses:nonfatal is specified</output>
-		<output type="success"  caseSensitive="yes" regex="yes" javaUtilPattern="yes">(OpenJDK|Java\(TM\) SE) Runtime Environment</output>
+		<output type="success"  caseSensitive="yes" regex="yes" javaUtilPattern="yes">(Semeru|OpenJDK|Java\(TM\) SE) Runtime Environment</output>
 
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>

diff --git a/test/functional/cmdLineTests/xlogTests/xlog.xml b/test/functional/cmdLineTests/xlogTests/xlog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 
 <!--
-Copyright (c) 2020, 2020 IBM Corp. and others
+Copyright (c) 2020, 2021 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
@@ -29,125 +29,111 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 
 	<test id="-Xlog">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog: -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:all">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:all -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:all=off">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:all=off -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:any,gc">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:any,gc -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc,any">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc,any -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc,any=off">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc,any=off -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
 	</test>
 
 	<test id="-Xlog:gc:">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc: -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
 	</test>
 
 	<test id="-Xlog:gc:stderr">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:stderr -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
 	</test>
 
 	<test id="-Xlog:gc:stderr">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:stderr: -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
 	</test>
 
 	<test id="-Xlog:gc:stderr:any">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:stderr:any -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc:stdout">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:stdout -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">verbosegc</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc:gclog">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:gclog -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
@@ -162,8 +148,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 
 	<test id="-Xlog:gc:gclog:">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:gclog: -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
@@ -178,8 +163,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 
 	<test id="-Xlog:gc:file=gclog">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc:file=gclog -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 		<output regex="no" type="failure">JVMJ9VM007</output>
@@ -194,53 +178,47 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 
 	<test id="-Xlog:gc=off">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc=off -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:any+gc=off">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:any+gc=off -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc+any=off">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc+any=off -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:gc=off,any">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:gc=off,any -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:any,gc=off">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:any,gc=off -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
 	</test>
 
 	<test id="-Xlog:disable">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:disable -version</command>
-		<output regex="no" type="success">openjdk version</output>
-		<output regex="no" type="success">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="success">(openjdk|java|semeru) version</output>
 		<output regex="no" type="required">JVMJ9VM007W</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM085</output>
@@ -249,26 +227,23 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
 	<test id="-Xlog:disable:">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:disable: -version</command>
 		<output regex="no" type="success">JVMJ9VM085E</output>
-		<output regex="no" type="failure">openjdk version</output>
-		<output regex="no" type="failure">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="failure">(openjdk|java|semeru) version</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM007W</output>
 	</test>
 
 	<test id="-Xlog:disable,any">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:disable,any -version</command>
 		<output regex="no" type="success">JVMJ9VM085E</output>
-		<output regex="no" type="failure">openjdk version</output>
-		<output regex="no" type="failure">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="failure">(openjdk|java|semeru) version</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM007W</output>
 	</test>
 
 	<test id="-Xlog:disable+any">
 		<command>$EXE$ $ENABLEXLOG$ -Xlog:disable+any -version</command>
 		<output regex="no" type="success">JVMJ9VM085E</output>
-		<output regex="no" type="failure">openjdk version</output>
-		<output regex="no" type="failure">java version</output>
+		<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="failure">(openjdk|java|semeru) version</output>
 		<output regex="no" type="failure">verbosegc</output>
 		<output regex="no" type="failure">JVMJ9VM007W</output>
 	</test>