test/hotspot/jtreg/gc/logging/TestGCId.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 39,59 ****
    public static void main(String[] args) throws Exception {
      testGCId("UseParallelGC");
      testGCId("UseG1GC");
      testGCId("UseConcMarkSweepGC");
      testGCId("UseSerialGC");
    }
  
    private static void verifyContainsGCIDs(OutputAnalyzer output) {
      output.shouldMatch("\\[.*\\]\\[.*\\]\\[.*\\] GC\\(0\\) ");
      output.shouldMatch("\\[.*\\]\\[.*\\]\\[.*\\] GC\\(1\\) ");
      output.shouldHaveExitValue(0);
    }
  
    private static void testGCId(String gcFlag) throws Exception {
      ProcessBuilder pb_default =
!       ProcessTools.createJavaProcessBuilder("-XX:+" + gcFlag, "-Xlog:gc", "-Xmx10M", GCTest.class.getName());
      verifyContainsGCIDs(new OutputAnalyzer(pb_default.start()));
    }
  
    static class GCTest {
      private static byte[] garbage;
--- 39,60 ----
    public static void main(String[] args) throws Exception {
      testGCId("UseParallelGC");
      testGCId("UseG1GC");
      testGCId("UseConcMarkSweepGC");
      testGCId("UseSerialGC");
+     testGCId("UseShenandoahGC");
    }
  
    private static void verifyContainsGCIDs(OutputAnalyzer output) {
      output.shouldMatch("\\[.*\\]\\[.*\\]\\[.*\\] GC\\(0\\) ");
      output.shouldMatch("\\[.*\\]\\[.*\\]\\[.*\\] GC\\(1\\) ");
      output.shouldHaveExitValue(0);
    }
  
    private static void testGCId(String gcFlag) throws Exception {
      ProcessBuilder pb_default =
!       ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions", "-XX:+" + gcFlag, "-Xlog:gc", "-Xmx10M", GCTest.class.getName());
      verifyContainsGCIDs(new OutputAnalyzer(pb_default.start()));
    }
  
    static class GCTest {
      private static byte[] garbage;