test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2013, 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) 2003, 2014, 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.
*** 64,78 ****
       * First with default command line specified by the framework.
       * Then with GC versions specified by the test.
       */
      public static void main(String a[]) throws Throwable {
          final String main = "CollectionUsageThreshold$TestMain";
!         RunUtil.runTestKeepGcOpts(main);
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseSerialGC");
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseParallelGC");
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseG1GC");
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseConcMarkSweepGC");
      }
  
      static class PoolRecord {
          private final MemoryPoolMXBean pool;
          private final AtomicInteger listenerInvoked = new AtomicInteger(0);
--- 64,79 ----
       * First with default command line specified by the framework.
       * Then with GC versions specified by the test.
       */
      public static void main(String a[]) throws Throwable {
          final String main = "CollectionUsageThreshold$TestMain";
!         final String noExplictGC = "-XX:-ExplicitGCInvokesConcurrent";
!         RunUtil.runTestKeepGcOpts(main, noExplictGC);
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseSerialGC", noExplictGC);
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseParallelGC", noExplictGC);
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseG1GC", noExplictGC);
!         RunUtil.runTestClearGcOpts(main, "-XX:+UseConcMarkSweepGC", noExplictGC);
      }
  
      static class PoolRecord {
          private final MemoryPoolMXBean pool;
          private final AtomicInteger listenerInvoked = new AtomicInteger(0);