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

rev 55538 : 8226757: Shenandoah: Make Traversal a separate mode

@@ -53,27 +53,33 @@
         if (args.length > 0 && args[0].equals("test")) {
             System.gc();
             System.exit(0);
         }
 
-        String[] heuristics = new String[] {
+        String[][][] modeHeuristics = new String[][][] {
+             {{"normal"}, {
                 "adaptive",
                 "compact",
                 "static",
-                "aggressive",
-                "passive",
-                "traversal",
+                 "aggressive"}},
+            {{"traversal"}, {"adaptive"}},
+            {{"passive"}, {"passive"}}
         };
 
+        for (String[][] mh : modeHeuristics) {
+            String mode = mh[0][0];
+            String[] heuristics = mh[1];
         for (String h : heuristics) {
             testWith("-XX:+UnlockDiagnosticVMOptions",
                      "-XX:+UnlockExperimentalVMOptions",
                      "-XX:+UseShenandoahGC",
                      "-XX:-ShenandoahDegeneratedGC",
+                         "-XX:ShenandoahGCMode=" + mode,
                      "-XX:ShenandoahGCHeuristics=" + h,
                      "-Xlog:gc+classhisto=trace",
                      "-XX:-ExplicitGCInvokesConcurrent",
                      "-Xmx512M"
             );
         }
     }
+    }
 }