test/hotspot/jtreg/vmTestbase/metaspace/gc/HighWaterMarkTest.java

*** 185,201 ****
              // perhpas, it's better to silently pass here... Let's see.
              throw new Fault ("Unable to count full collections, could be an env issue");
          }
          System.out.println("% GC has been invoked: " + gcCount + " times");
  
-         if (VMRuntimeEnvUtils.isVMOptionEnabled("UseG1GC") &&
-               VMRuntimeEnvUtils.isVMOptionEnabled("ClassUnloadingWithConcurrentMark")) {
-             System.out.println("% isG1ClassUnloading: true");
-             if (gcCount != 0) {
-                 throw new Fault ("G1 should unload classes, full GC is not expected");
-             }
-         } else {
              if (maxMetaspaceFreeRatio <= 1) {
                  // min/max = 0/1  boundary value
                  // GC should happen very often
                  checkGCCount(gcCount, 20, -1);
              } else if (minMetaspaceFreeRatio >= 99) {
--- 185,194 ----
*** 209,219 ****
                  // GC should happen quite often
                  checkGCCount(gcCount, 1, 3);
              } else {
                  // hard to estimate
              }
-         }
  
      }
      /**
       * Checks that count of GC fits the expected range.
       * Throws Fault if count is unexpected.
--- 202,211 ----