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

@@ -43,15 +43,22 @@
                  "ShenandoahCASBarrier",
                  "ShenandoahCloneBarrier",
                  "ShenandoahStackWatermarkBarrier",
          };
  
+         String[] generational = {
+                 "ShenandoahCardBarrier"
+         };
+ 
          shouldFailAll("-XX:ShenandoahGCHeuristics=adaptive",   concurrent);
          shouldFailAll("-XX:ShenandoahGCHeuristics=static",     concurrent);
          shouldFailAll("-XX:ShenandoahGCHeuristics=compact",    concurrent);
          shouldFailAll("-XX:ShenandoahGCHeuristics=aggressive", concurrent);
          shouldPassAll("-XX:ShenandoahGCMode=passive",          concurrent);
+         shouldPassAll("-XX:ShenandoahGCMode=passive",          generational);
+         shouldPassAll("-XX:ShenandoahGCMode=satb",             generational);
+         shouldFailAll("-XX:ShenandoahGCMode=generational",     generational);
      }
  
      private static void shouldFailAll(String h, String[] barriers) throws Exception {
          for (String b : barriers) {
              OutputAnalyzer output = ProcessTools.executeLimitedTestJava(