stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2012-03-31 08:43:56 -07:00
commit 1bbe27a179
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/test/tools/launcher/ToolsOpts.java
View File

@ -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")) {