--- old/test/jdk/ProblemList.txt 2019-10-22 08:03:14.000000000 -0700 +++ new/test/jdk/ProblemList.txt 2019-10-22 08:03:14.000000000 -0700 @@ -890,6 +890,4 @@ # jdk_internal -jdk/internal/platform/docker/TestDockerMemoryMetrics.java 8227317 linux-x64 - ############################################################################ --- old/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java 2019-10-22 08:03:15.000000000 -0700 +++ new/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java 2019-10-22 08:03:15.000000000 -0700 @@ -25,6 +25,7 @@ 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 @@ -119,7 +120,13 @@ .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!!!"); + 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 {