7043125: TEST: tools/launcher/VersionCheck.java fails just against openjdk7 (b141 & b138-nightly) promoted
Reviewed-by: darcy
diff --git a/test/tools/launcher/ExecutionEnvironment.java b/test/tools/launcher/ExecutionEnvironment.java
index fec9f6a..720df5e 100644
--- a/test/tools/launcher/ExecutionEnvironment.java
+++ b/test/tools/launcher/ExecutionEnvironment.java
@@ -299,8 +299,8 @@
if (TestHelper.is32Bit) {
tr = TestHelper.doExec(TestHelper.javaCmd, "-client", "-version");
- if (!tr.matches("Java.*Client VM.*")) {
- System.out.println("FAIL: the expected vm -client did launch");
+ if (!tr.matches(".*Client VM.*")) {
+ System.out.println("FAIL: the expected vm -client did not launch");
System.out.println(tr);
errors++;
} else {
@@ -308,8 +308,8 @@
}
}
tr = TestHelper.doExec(TestHelper.javaCmd, "-server", "-version");
- if (!tr.matches("Java.*Server VM.*")) {
- System.out.println("FAIL: the expected vm -server did launch");
+ if (!tr.matches(".*Server VM.*")) {
+ System.out.println("FAIL: the expected vm -server did not launch");
System.out.println(tr);
errors++;
} else {
diff --git a/test/tools/launcher/VersionCheck.java b/test/tools/launcher/VersionCheck.java
index a1bca75..acef7bb 100644
--- a/test/tools/launcher/VersionCheck.java
+++ b/test/tools/launcher/VersionCheck.java
@@ -132,7 +132,7 @@
StringBuilder out = new StringBuilder();
// remove the HotSpot line
for (String x : alist) {
- if (!x.contains("HotSpot")) {
+ if (!x.matches(".*Client.*VM.*|.*Server.*VM.*")) {
out = out.append(x + "\n");
}
}