From f6b09b19b85497ad87e1ad2b6feaab5239a29755 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Mon, 13 Mar 2017 16:23:43 -0400 Subject: [PATCH 1/2] 8176471: [TESTBUG] runtime/modules/IgnoreModulePropertiesTest.java fails with OpenJDK: java.lang.RuntimeException: 'java version ' missing from stdout/stderr Check for strings such as " version " and "Runtime Environment" that appear in 'java -version' for both open and closed builds. Reviewed-by: coleenp --- jdk/test/sun/tools/jinfo/JInfoTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jdk/test/sun/tools/jinfo/JInfoTest.java b/jdk/test/sun/tools/jinfo/JInfoTest.java index 720874ba567..260486e1bf6 100644 --- a/jdk/test/sun/tools/jinfo/JInfoTest.java +++ b/jdk/test/sun/tools/jinfo/JInfoTest.java @@ -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 @@ public class JInfoTest { 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); From dc2a5712dcf31132adaf14a7c9e7d8d6f02dd4d2 Mon Sep 17 00:00:00 2001 From: Robbin Ehn Date: Tue, 14 Mar 2017 12:00:03 +0100 Subject: [PATCH 2/2] 8176098: Deprecate FlatProfiler Reviewed-by: shade, coleenp --- .../share/classes/sun/launcher/resources/launcher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties index 932a69c3bdf..5d56279be52 100644 --- a/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties +++ b/jdk/src/java.base/share/classes/sun/launcher/resources/launcher.properties @@ -129,7 +129,7 @@ java.launcher.X.usage=\n\ \ -Xms set initial Java heap size\n\ \ -Xmx set maximum Java heap size\n\ \ -Xnoclassgc disable class garbage collection\n\ -\ -Xprof output cpu profiling data\n\ +\ -Xprof output cpu profiling data (deprecated)\n\ \ -Xrs reduce use of OS signals by Java/VM (see documentation)\n\ \ -Xshare:auto use shared class data if possible (default)\n\ \ -Xshare:off do not attempt to use shared class data\n\