OpenJDK / amber / amber
changeset 44337:9e4eb1b70d5b
8176471: [TESTBUG] runtime/modules/IgnoreModulePropertiesTest.java fails with OpenJDK: java.lang.RuntimeException: 'java version ' missing from stdout/stderr
Summary: Check for strings such as " version " and "Runtime Environment" that appear in 'java -version' for both open and closed builds.
Reviewed-by: coleenp
| author | hseigel |
|---|---|
| date | Mon, 13 Mar 2017 16:23:43 -0400 |
| parents | 986cf0d8321e |
| children | 92f2d268e81b |
| files | jdk/test/sun/tools/jinfo/JInfoTest.java |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/sun/tools/jinfo/JInfoTest.java Fri Mar 03 20:50:26 2017 +0100 +++ b/jdk/test/sun/tools/jinfo/JInfoTest.java Mon Mar 13 16:23:43 2017 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -88,8 +88,8 @@ LingeredApp.startApp(params, app2); OutputAnalyzer output = jinfo("JInfoTestLingeredApp"); output.shouldHaveExitValue(0); - // "HotSpot(TM)" written once per proc - documentMatch(output.getStdout(), ".*HotSpot\\(TM\\).*HotSpot\\(TM\\).*"); + // "Runtime Environment" written once per proc + documentMatch(output.getStdout(), ".*Runtime Environment.*Runtime Environment.*"); } finally { JInfoTestLingeredApp.stopApp(app1); JInfoTestLingeredApp.stopApp(app2);