test/gc/startup_warnings/TestCMS.java

rev 12742 : 8179013: Deprecate the Concurrent Mark Sweep (CMS) Garbage Collector

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 22,53 ****
   */
  
  /*
  * @test TestCMS
  * @key gc
! * @bug 8006398 8155948
! * @summary Test that CMS prints a warning message only for a commercial build
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  */
  
  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.shouldNotContain("error");
      output.shouldHaveExitValue(0);
    }
  
    public static void main(String args[]) throws Exception {
--- 22,47 ----
   */
  
  /*
  * @test TestCMS
  * @key gc
! * @bug 8006398 8155948 8179013
! * @summary Test that CMS prints a warning message
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  */
  
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
  
  public class TestCMS {
  
    public static void runTest(String[] args) throws Exception {
      ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
      OutputAnalyzer output = new OutputAnalyzer(pb.start());
!     output.shouldContain("deprecated");
      output.shouldNotContain("error");
      output.shouldHaveExitValue(0);
    }
  
    public static void main(String args[]) throws Exception {