test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java

*** 23,32 ****
--- 23,33 ----
  
  import jdk.test.lib.Utils;
  import jdk.test.lib.containers.docker.Common;
  import jdk.test.lib.containers.docker.DockerRunOptions;
  import jdk.test.lib.containers.docker.DockerTestUtils;
+ import jdk.test.lib.process.OutputAnalyzer;
  
  /*
   * @test
   * @summary Test JDK Metrics class when running inside docker container
   * @requires docker.support
*** 117,127 ****
          opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/")
                  .addDockerOpts("--kernel-memory=" + value)
                  .addJavaOpts("-cp", "/test-classes/")
                  .addJavaOpts("--add-exports", "java.base/jdk.internal.platform=ALL-UNNAMED")
                  .addClassOptions("kernelmem", value);
!         DockerTestUtils.dockerRunJava(opts).shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");
      }
  
      private static void testOomKillFlag(String value, boolean oomKillFlag) throws Exception {
          Common.logNewTestCase("testOomKillFlag, oomKillFlag = " + oomKillFlag);
          DockerRunOptions opts =
--- 118,134 ----
          opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/")
                  .addDockerOpts("--kernel-memory=" + value)
                  .addJavaOpts("-cp", "/test-classes/")
                  .addJavaOpts("--add-exports", "java.base/jdk.internal.platform=ALL-UNNAMED")
                  .addClassOptions("kernelmem", value);
!         OutputAnalyzer oa = DockerTestUtils.dockerRunJava(opts);
!         if (oa.getStderr().contains("kernel memory accounting disabled")) {
!             System.out.println("Kernel memory accounting disabled on this system, " +
!                                        "skipping the test case");
!             return;
!         }
!         oa.shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");
      }
  
      private static void testOomKillFlag(String value, boolean oomKillFlag) throws Exception {
          Common.logNewTestCase("testOomKillFlag, oomKillFlag = " + oomKillFlag);
          DockerRunOptions opts =