提交 7818be03 编写于 作者: L lana

Merge

...@@ -132,9 +132,10 @@ public class ToolsOpts extends TestHelper { ...@@ -132,9 +132,10 @@ public class ToolsOpts extends TestHelper {
} }
if (pat.compareTo("-J-version") == 0 || if (pat.compareTo("-J-version") == 0 ||
pat.compareTo("-J-showversion") == 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 + throw new RuntimeException("failed: " + pat +
" should have display java version."); " should display a version string.");
} }
} else if (pat.compareTo("-J-XshowSettings:VM") == 0) { } else if (pat.compareTo("-J-XshowSettings:VM") == 0) {
if (!tr.contains("VM settings")) { if (!tr.contains("VM settings")) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册