From b6bd2e334897ebca39c99c891d8b0ea75e603499 Mon Sep 17 00:00:00 2001
From: aoqi <unknown>
Date: Thu, 31 Jan 2019 23:56:37 +0800
Subject: [PATCH] 8217597: [TESTBUG] old version docker does not support --cpus
 Summary: "--cpus" is only available in Docker 1.13 and higher, and is the
 equivalent of setting both --cpu-period and --cpu-quota. Reviewed-by: bobv,
 dholmes Contributed-by: aoqi@loongson.cn

---
 test/runtime/containers/docker/TestCPUAwareness.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/runtime/containers/docker/TestCPUAwareness.java b/test/runtime/containers/docker/TestCPUAwareness.java
index fe7d4499b..886aefcaf 100644
--- a/test/runtime/containers/docker/TestCPUAwareness.java
+++ b/test/runtime/containers/docker/TestCPUAwareness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -125,7 +125,8 @@ private static final String imageName = Common.imageName("cpu");
     private static void testCpus(int valueToSet, int expectedTraceValue) throws Exception {
         Common.logNewTestCase("test cpus: " + valueToSet);
         DockerRunOptions opts = Common.newOpts(imageName)
-            .addDockerOpts("--cpus", "" + valueToSet);
+            .addDockerOpts("--cpu-period=" + 10000)
+            .addDockerOpts("--cpu-quota=" + valueToSet * 10000);
         Common.run(opts)
             .shouldMatch("active_processor_count.*" + expectedTraceValue);
     }
-- 
GitLab