OpenJDK / amber / amber
changeset 12305:e10f44345be4
Merge
| author | lana |
|---|---|
| date | Sat, 31 Mar 2012 08:43:56 -0700 |
| parents | 2dc3af8dd124 498f8b38423b |
| children | 35ebe1184d3d |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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")) {