OpenJDK / jdk / hs
changeset 44741:c5de7263722b
8179013: Deprecate the Concurrent Mark Sweep (CMS) Garbage Collector
Reviewed-by: sjohanss, sangheki
| author | ehelin |
|---|---|
| date | Sat, 22 Apr 2017 12:05:20 +0200 |
| parents | 8a8cfc348148 |
| children | 45f85d4d9b08 87af7c1d14a8 48ced7755a3b f61bcd80ec1f |
| files | hotspot/src/share/vm/runtime/arguments.cpp hotspot/test/gc/startup_warnings/TestCMS.java |
| diffstat | 2 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/arguments.cpp Fri Apr 21 03:34:29 2017 +0000 +++ b/hotspot/src/share/vm/runtime/arguments.cpp Sat Apr 22 12:05:20 2017 +0200 @@ -375,6 +375,7 @@ // -------------- Deprecated Flags -------------- // --- Non-alias flags - sorted by obsolete_in then expired_in: { "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, + { "UseConcMarkSweepGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, { "AutoGCSelectPauseMillis", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) }, { "UseAutoGCSelectPolicy", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) }, { "UseParNewGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(10) },
--- a/hotspot/test/gc/startup_warnings/TestCMS.java Fri Apr 21 03:34:29 2017 +0000 +++ b/hotspot/test/gc/startup_warnings/TestCMS.java Sat Apr 22 12:05:20 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 @@ -24,8 +24,8 @@ /* * @test TestCMS * @key gc -* @bug 8006398 8155948 -* @summary Test that CMS prints a warning message only for a commercial build +* @bug 8006398 8155948 8179013 +* @summary Test that CMS prints a warning message * @library /test/lib * @modules java.base/jdk.internal.misc * java.management @@ -33,19 +33,13 @@ import jdk.test.lib.process.ProcessTools; import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.BuildHelper; public class TestCMS { public static void runTest(String[] args) throws Exception { - boolean isCommercial = BuildHelper.isCommercialBuild(); ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args); OutputAnalyzer output = new OutputAnalyzer(pb.start()); - if (isCommercial) { - output.shouldContain("deprecated"); - } else { - output.shouldNotContain("deprecated"); - } + output.shouldContain("deprecated"); output.shouldNotContain("error"); output.shouldHaveExitValue(0); }