Recognize new product name Semeru

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
eclipse-openj9 · Jul 19, 2021 · 951b402 · 951b402
1 parent 5b9d76f
commit 951b402
Show file tree

Hide file tree

Showing 18 changed files with 239 additions and 239 deletions.
diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests.xml
@@ -69,7 +69,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
         <command>$EXE$ $JVM_HEAP_LIMIT$ $ONOUTOFMEMORYERROR_EQUALS$"$EXE$ -version" $ONOUTOFMEMORYERROR_JAR$</command>
         <output type="success" caseSensitive="yes" regex="no">$JAVALANGOUTOFMEMORYERROR$</output>
         <output type="required" caseSensitive="yes" regex="yes" javaUtilPattern="yes">java (.)* -version</output>
-        <output type="required" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+        <output type="required" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
     </test>
 
     <test id="Verify Xdump:exit behaves as expected">

diff --git a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedvmoptions.xml b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedvmoptions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 
 <!--
-  Copyright (c) 2016, 2018 IBM Corp. and others
+  Copyright (c) 2016, 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
@@ -34,50 +34,50 @@
 
  <test id="test -XX:+IgnoreUnrecognizedVMOptions, bad option: --abc=def.ghi">
   <command>$EXE$ $IGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION1$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 
  <test id="test -XX:+IgnoreUnrecognizedVMOptions, bad option: -Xtr:minimizeUserCPU,what">
   <command>$EXE$ $IGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION2$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 
  <test id="test -XX:-IgnoreUnrecognizedVMOptions, bad option: --abc=def.ghi">
   <command>$EXE$ $NOIGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION1$ -version</command>
   <output type="success" caseSensitive="no" regex="no">Command-line option unrecognised</output>
-  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
  </test>
 
  <test id="test -XX:-IgnoreUnrecognizedVMOptions, bad option: -Xtr:minimizeUserCPU,what">
   <command>$EXE$ $NOIGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION2$ -version</command>
   <output type="success" caseSensitive="no" regex="no">Command-line option unrecognised</output>
-  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
  </test>
 
   <test id="test -XX:-IgnoreUnrecognizedVMOptions -XX:+IgnoreUnrecognizedVMOptions, bad option: --abc=def.ghi">
   <command>$EXE$ $NOIGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION1$ $IGNOREUNRECOGNIZEDVMOPTIONS$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 
  <test id="test -XX:-IgnoreUnrecognizedVMOptions -XX:+IgnoreUnrecognizedVMOptions, bad option: -Xtr:minimizeUserCPU,what">
   <command>$EXE$ $NOIGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION2$ $IGNOREUNRECOGNIZEDVMOPTIONS$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 
  <test id="test -XX:+IgnoreUnrecognizedVMOptions -XX:-IgnoreUnrecognizedVMOptions, bad option: --abc=def.ghi">
   <command>$EXE$ $IGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION1$ $NOIGNOREUNRECOGNIZEDVMOPTIONS$ -version</command>
   <output type="success" caseSensitive="no" regex="no">Command-line option unrecognised</output>
-  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
  </test>
 
  <test id="test -XX:+IgnoreUnrecognizedVMOptions -XX:-IgnoreUnrecognizedVMOptions, bad option: -Xtr:minimizeUserCPU,what">
   <command>$EXE$ $IGNOREUNRECOGNIZEDVMOPTIONS$ $BADOPTION2$ $NOIGNOREUNRECOGNIZEDVMOPTIONS$ -version</command>
   <output type="success" caseSensitive="no" regex="no">Command-line option unrecognised</output>
-  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
  </test>
 
 </suite>
diff --git a/.../functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedxxcolonoptions.xml b/.../functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedxxcolonoptions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 
 <!--
-  Copyright (c) 2019, 2019 IBM Corp. and others
+  Copyright (c) 2019, 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
@@ -34,25 +34,25 @@
 
  <test id="test -XX:-IgnoreUnrecognizedXXColonOptions -XX:+IgnoreUnrecognizedXXColonOptions, bad option: -XX:INVALID">
   <command>$EXE$ $NOIGNOREUNRECOGNIZEDXXOPTIONS$ $BADOPTION$ $IGNOREUNRECOGNIZEDXXOPTIONS$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 
  <test id="test -XX:-IgnoreUnrecognizedXXColonOptions -XX:+IgnoreUnrecognizedXXColonOptions, good option: -XX:+DisableExplicitGC">
   <command>$EXE$ $NOIGNOREUNRECOGNIZEDXXOPTIONS$ $GOODOPTION$ $IGNOREUNRECOGNIZEDXXOPTIONS$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 
  <test id="test -XX:+IgnoreUnrecognizedXXColonOptions -XX:-IgnoreUnrecognizedXXColonOptions, bad option: -XX:INVALID">
   <command>$EXE$ $IGNOREUNRECOGNIZEDXXOPTIONS$ $BADOPTION$ $NOIGNOREUNRECOGNIZEDXXOPTIONS$ -version</command>
   <output type="success" caseSensitive="no" regex="no">Command-line option unrecognised</output>
-  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="failure" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
  </test>
 
  <test id="test -XX:+IgnoreUnrecognizedXXColonOptions -XX:-IgnoreUnrecognizedXXColonOptions, good option: -XX:+DisableExplicitGC">
   <command>$EXE$ $IGNOREUNRECOGNIZEDXXOPTIONS$ $GOODOPTION$ $NOIGNOREUNRECOGNIZEDXXOPTIONS$ -version</command>
-  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Command-line option unrecognised</output>
  </test>
 

diff --git a/test/functional/cmdLineTests/jimageinterface/jimageinterface.xml b/test/functional/cmdLineTests/jimageinterface/jimageinterface.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 
 <!--
-  Copyright (c) 2015, 2018 IBM Corp. and others
+  Copyright (c) 2015, 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
@@ -33,7 +33,7 @@
  <test id="Test JImage Interface default behavior">
   <command>$EXE$ -verbose:dynload -version</command>
   <output regex="yes" type="success" javaUtilPattern="yes" >JImage interface is using jimage library</output>
-  <output regex="yes" type="required" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output regex="yes" caseSensitive="no" type="required" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
   <output type="failure" caseSensitive="yes" regex="no">Exception:</output>
   <output type="failure" caseSensitive="no" regex="no">corrupt</output>
@@ -43,7 +43,7 @@
  <test id="Test JImage Interface with -XX:+UseJ9JImageReader">
   <command>$EXE$ $USEJ9JIMAGEREADER$ -verbose:dynload -version</command>
   <output regex="no" type="success">JImage interface is using internal implementation of jimage reader</output>
-  <output regex="yes" type="required" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output regex="yes" caseSensitive="no" type="required" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
   <output type="failure" caseSensitive="yes" regex="no">Exception:</output>
   <output type="failure" caseSensitive="no" regex="no">corrupt</output>
@@ -53,7 +53,7 @@
  <test id="Test JImage Interface with -XX:-UseJ9JImageReader">
   <command>$EXE$ $NOUSEJ9JIMAGEREADER$ -verbose:dynload -version</command>
   <output regex="no" type="success">JImage interface is using jimage library</output>
-  <output regex="yes" type="required" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output regex="yes" caseSensitive="no" type="required" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
   <output type="failure" caseSensitive="yes" regex="no">Exception:</output>
   <output type="failure" caseSensitive="no" regex="no">corrupt</output>
@@ -64,7 +64,7 @@
  <test id="Test JImage Interface with -XX:+UseJ9JImageReader -XX:-UseJ9JImageReader"> 
   <command>$EXE$ $USEJ9JIMAGEREADER$ $NOUSEJ9JIMAGEREADER$ -verbose:dynload -version</command>
   <output regex="no" type="success">JImage interface is using jimage library</output>
-  <output regex="yes" type="required" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output regex="yes" caseSensitive="no" type="required" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure">JImage interface is using internal implementation of jimage reader</output>
   <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
   <output type="failure" caseSensitive="yes" regex="no">Exception:</output>
@@ -75,7 +75,7 @@
  <test id="Test JImage Interface with -XX:-UseJ9JImageReader -XX:+UseJ9JImageReader"> 
   <command>$EXE$ $NOUSEJ9JIMAGEREADER$ $USEJ9JIMAGEREADER$ -verbose:dynload -version</command>
   <output regex="no" type="success">JImage interface is using internal implementation of jimage reader</output>
-  <output regex="yes" type="required" javaUtilPattern="yes">(java|openjdk) version</output>
+  <output regex="yes" caseSensitive="no" type="required" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
   <output type="failure">JImage interface is using jimage library</output>
   <output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
   <output type="failure" caseSensitive="yes" regex="no">Exception:</output>

diff --git a/...unctional/cmdLineTests/shareClassTests/ListAllCachesTests/expireAndListAllCachesTests.xml b/...unctional/cmdLineTests/shareClassTests/ListAllCachesTests/expireAndListAllCachesTests.xml
@@ -57,35 +57,35 @@
 
 	<test id="Expire & List 1: Create nonpersistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA_EXE$ $currentMode$NP,nonpersistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="Expire & List 2: Create Java 6 nonpersistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA6_EXE$ $currentMode$NP,nonpersistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="Expire & List 3: Create Java 6 persistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA6_EXE$ $currentMode$P,persistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="Expire & List 4: Create persistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA_EXE$ $currentMode$P,persistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="Expire & List 5: expire persistent cache." timeout="600" runPath=".">
 		<command>$JAVA_EXE$ $currentMode$P,persistent,expire=0 -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>

diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/listAllCachesTests.xml b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/listAllCachesTests.xml
@@ -53,21 +53,21 @@
 
 	<test id="ListAllCaches 2: Make sure Java 6 is present" timeout="600" runPath=".">
 		<command>$JAVA6_EXE$ -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="ListAllCaches 3: Create Java 6 nonpersistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA6_EXE$ $currentMode$NP,nonpersistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="ListAllCaches 4: Create Java 6 persistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA6_EXE$ $currentMode$P,persistent -version</command>
-		<output type="success" caseSensitive="yes" regex="no"  javaUtilregex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="no"  javaUtilregex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
@@ -92,14 +92,14 @@
 
 	<test id="ListAllCaches 7: Create a nonpersistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA_EXE$ $currentMode$NP,nonpersistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>
 
 	<test id="ListAllCaches 8: Create a persistent shared cache" timeout="600" runPath=".">
 		<command>$JAVA_EXE$ $currentMode$P,persistent -version</command>
-		<output type="success" caseSensitive="yes" regex="yes" javaUtilPattern="yes">(java|openjdk) version</output>
+		<output type="success" caseSensitive="no" regex="yes" javaUtilPattern="yes">(java|openjdk|semeru) version</output>
 		<output type="failure" caseSensitive="no" regex="no">Unhandled Exception</output>
 		<output type="failure" caseSensitive="yes" regex="no">Exception:</output>
 	</test>