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

@@ -41,18 +41,27 @@
                  "ShenandoahIUBarrier",
          };
          String[] iu = {
                  "ShenandoahSATBBarrier",
          };
+         String[] generational = {
+                 "ShenandoahCardBarrier"
+         };
+         String[] all = {
+                 "ShenandoahSATBBarrier", "ShenandoahCardBarrier"
+         };
  
          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);
+         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 +91,6 @@
                      "-version"
              );
              output.shouldHaveExitValue(0);
          }
      }
- 
  }