# HG changeset patch
# User jiefu
# Date 1572890612 28800
# Node ID 02ae223a11dc19503a434c856b081cea0ef355eb
# Parent  6f98d0173a72046ed37280bf49913a106c1996f1
8233291: [TESTBUG] tools/jlink/plugins/VendorInfoPluginsTest.java fails with debug or non-server VMs
Reviewed-by: mchung

diff -r 6f98d0173a72 -r 02ae223a11dc test/jdk/tools/jlink/plugins/VendorInfoPluginsTest.java
--- 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 + " \\(.*$");
 
     }