test/hotspot/jtreg/gc/shenandoah/TestJcmdHeapDump.java

*** 1,7 ***
--- 1,8 ---
  /*
   * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. 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.

*** 71,61 ***
   *      -Dtarget=10000
   *      TestJcmdHeapDump
   */
  
  /*
!  * @test id=static
   * @library /test/lib
   * @modules jdk.attach/com.sun.tools.attach
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
   *      TestJcmdHeapDump
   */
  
  /*
!  * @test id=compact
-  * @library /test/lib
-  * @modules jdk.attach/com.sun.tools.attach
-  * @requires vm.gc.Shenandoah
-  *
-  * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
-  *     TestJcmdHeapDump
-  */
- 
- /*
-  * @test id=iu-aggressive
   * @library /test/lib
   * @modules jdk.attach/com.sun.tools.attach
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
-  *      -XX:+ShenandoahOOMDuringEvacALot
-  *      TestJcmdHeapDump
-  *
-  * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
-  *      -XX:+ShenandoahAllocFailureALot
-  *      TestJcmdHeapDump
-  *
-  * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
   *      TestJcmdHeapDump
   */
  
  /*
!  * @test id=iu
-  * @requires vm.gc.Shenandoah
   * @library /test/lib
   * @modules jdk.attach/com.sun.tools.attach
   *
   * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
!  *      TestJcmdHeapDump
   */
  
  import jdk.test.lib.JDKToolLauncher;
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
--- 72,41 ---
   *      -Dtarget=10000
   *      TestJcmdHeapDump
   */
  
  /*
!  * @test id=generational
   * @library /test/lib
   * @modules jdk.attach/com.sun.tools.attach
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
+  *      -Dtarget=10000
   *      TestJcmdHeapDump
   */
  
  /*
!  * @test id=static
   * @library /test/lib
   * @modules jdk.attach/com.sun.tools.attach
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
   *      TestJcmdHeapDump
   */
  
  /*
!  * @test id=compact
   * @library /test/lib
   * @modules jdk.attach/com.sun.tools.attach
+  * @requires vm.gc.Shenandoah
   *
   * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
!  *     TestJcmdHeapDump
   */
  
  import jdk.test.lib.JDKToolLauncher;
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;