From e5700a0e11a1b5fc76c39b485f9dffa0d6553e33 Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Fri, 17 Jun 2011 15:17:01 -0700 Subject: [PATCH] 7043125: TEST: tools/launcher/VersionCheck.java fails just against openjdk7 (b141 & b138-nightly) promoted Reviewed-by: darcy --- jdk/test/tools/launcher/ExecutionEnvironment.java | 8 ++++---- jdk/test/tools/launcher/VersionCheck.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jdk/test/tools/launcher/ExecutionEnvironment.java b/jdk/test/tools/launcher/ExecutionEnvironment.java index fec9f6a0ba8..720df5e126e 100644 --- a/jdk/test/tools/launcher/ExecutionEnvironment.java +++ b/jdk/test/tools/launcher/ExecutionEnvironment.java @@ -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 { diff --git a/jdk/test/tools/launcher/VersionCheck.java b/jdk/test/tools/launcher/VersionCheck.java index a1bca7593d1..acef7bbea00 100644 --- a/jdk/test/tools/launcher/VersionCheck.java +++ b/jdk/test/tools/launcher/VersionCheck.java @@ -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"); } }