test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java

*** 21,11 ***
   * questions.
   *
   */
  
  /* @test
!  * @summary Test that disabling wrong barriers fails early
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   * @run driver TestWrongBarrierEnable
   */
  
--- 21,11 ---
   * questions.
   *
   */
  
  /* @test
!  * @summary Test that SATB barrier may be enabled for all modes
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   * @run driver TestWrongBarrierEnable
   */
  

*** 36,23 ***
  
  public class TestWrongBarrierEnable {
  
      public static void main(String[] args) throws Exception {
          String[] concurrent = {
-                 "ShenandoahIUBarrier",
-         };
-         String[] iu = {
                  "ShenandoahSATBBarrier",
          };
! 
!         shouldFailAll("-XX:ShenandoahGCHeuristics=adaptive",   concurrent);
!         shouldFailAll("-XX:ShenandoahGCHeuristics=static",     concurrent);
!         shouldFailAll("-XX:ShenandoahGCHeuristics=compact",    concurrent);
!         shouldFailAll("-XX:ShenandoahGCHeuristics=aggressive", concurrent);
!         shouldFailAll("-XX:ShenandoahGCMode=iu",               iu);
          shouldPassAll("-XX:ShenandoahGCMode=passive",          concurrent);
!         shouldPassAll("-XX:ShenandoahGCMode=passive",          iu);
      }
  
      private static void shouldFailAll(String h, String[] barriers) throws Exception {
          for (String b : barriers) {
              OutputAnalyzer output = ProcessTools.executeLimitedTestJava(
--- 36,26 ---
  
  public class TestWrongBarrierEnable {
  
      public static void main(String[] args) throws Exception {
          String[] concurrent = {
                  "ShenandoahSATBBarrier",
          };
!         String[] generational = {
!                 "ShenandoahCardBarrier"
!         };
!         String[] all = {
!                 "ShenandoahSATBBarrier", "ShenandoahCardBarrier"
!         };
+         shouldPassAll("-XX:ShenandoahGCHeuristics=adaptive",   concurrent);
+         shouldPassAll("-XX:ShenandoahGCHeuristics=static",     concurrent);
+         shouldPassAll("-XX:ShenandoahGCHeuristics=compact",    concurrent);
+         shouldPassAll("-XX:ShenandoahGCHeuristics=aggressive", concurrent);
          shouldPassAll("-XX:ShenandoahGCMode=passive",          concurrent);
!         shouldPassAll("-XX:ShenandoahGCMode=generational",     all);
+         shouldFailAll("-XX:ShenandoahGCMode=satb",             generational);
+         shouldFailAll("-XX:ShenandoahGCMode=passive",          generational);
      }
  
      private static void shouldFailAll(String h, String[] barriers) throws Exception {
          for (String b : barriers) {
              OutputAnalyzer output = ProcessTools.executeLimitedTestJava(

*** 82,7 ***
                      "-version"
              );
              output.shouldHaveExitValue(0);
          }
      }
- 
  }
--- 85,6 ---