infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-06 00:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

7043125: TEST: tools/launcher/VersionCheck.java fails just against openjdk7 (b141 & b138-nightly) promoted

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Kumar Srinivasan 2011-06-17 15:17:01 -07:00
parent eb2d2e632c
commit e5700a0e11
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/test/tools/launcher/ExecutionEnvironment.java
View File

@ -299,8 +299,8 @@ public class ExecutionEnvironment {
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 @@ public class ExecutionEnvironment {
}
}
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 {

2
jdk/test/tools/launcher/VersionCheck.java
View File

@ -132,7 +132,7 @@ public class VersionCheck {
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");
}
}