changeset 56813:02ae223a11dc

8233291: [TESTBUG] tools/jlink/plugins/VendorInfoPluginsTest.java fails with debug or non-server VMs Reviewed-by: mchung
author jiefu
date Mon, 04 Nov 2019 10:03:32 -0800
parents 6f98d0173a72
children 33f9271b3167
files test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java	Mon Nov 04 14:24:36 2019 +0000
+++ b/test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java	Mon Nov 04 10:03:32 2019 -0800
@@ -87,8 +87,8 @@
                                              "--version");
         oa.stderrShouldMatch("^ +java.vendor.url.bug = " + BUG_URL + "$");
         oa.stderrShouldMatch("^ +java.vendor.version = " + VERSION + "$");
-        oa.stdoutShouldMatch("^.*Runtime Environment " + VERSION + " \\(build.*$");
-        oa.stdoutShouldMatch("^.*Server VM " + VERSION + " \\(build.*$");
+        oa.stdoutShouldMatch("^.*Runtime Environment " + VERSION + " \\(.*build.*$");
+        oa.stdoutShouldMatch("^.*VM " + VERSION + " \\(.*build.*$");
 
         // VM error log
         oa = ProcessTools.executeProcess(launcher,
@@ -97,7 +97,7 @@
                                          "VendorInfoPluginsTest$Crasher");
         oa.stdoutShouldMatch("^# +" + VM_BUG_URL + "$");
         oa.stdoutShouldMatch("^.*Runtime Environment " + VERSION + " \\(.*$");
-        oa.stdoutShouldMatch("^.*Server VM " + VERSION + " \\(.*$");
+        oa.stdoutShouldMatch("^.*VM " + VERSION + " \\(.*$");
 
     }