# HG changeset patch
# User lana
# Date 1333208636 25200
# Node ID e10f44345be410109e61c53c985889d386e0e2a0
# Parent  2dc3af8dd124f680bee5fa9938f914254b47cfdd# Parent  498f8b38423bd5170007ea7fd217bdc13a556d53
Merge

diff -r 2dc3af8dd124 -r e10f44345be4 jdk/test/tools/launcher/ToolsOpts.java
--- a/jdk/test/tools/launcher/ToolsOpts.java	Fri Mar 30 16:57:50 2012 -0700
+++ b/jdk/test/tools/launcher/ToolsOpts.java	Sat Mar 31 08:43:56 2012 -0700
@@ -132,9 +132,10 @@
             }
             if (pat.compareTo("-J-version") == 0 ||
                     pat.compareTo("-J-showversion") == 0) {
-                if (!tr.contains("java version")) {
+                if (!tr.contains("java version") &&
+                        !tr.contains("openjdk version")) {
                     throw new RuntimeException("failed: " + pat +
-                            " should have display java version.");
+                            " should display a version string.");
                 }
             } else if (pat.compareTo("-J-XshowSettings:VM") == 0) {
                 if (!tr.contains("VM settings")) {