diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java index 3ee847b28b1..db40d018d83 100644 --- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java +++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java @@ -34,18 +34,21 @@ import java.lang.management.*; import jdk.test.lib.Platform; public class GetProcessCpuLoad { + + private static final int TEST_COUNT = 10; + public static void main(String[] argv) throws Exception { OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); Exception ex = null; - double load; + int good = 0; - for(int i = 0; i < 10; i++) { - load = mbean.getProcessCpuLoad(); + for (int i = 0; i < TEST_COUNT; i++) { + double load = mbean.getProcessCpuLoad(); if (load == -1.0 && Platform.isWindows()) { - // Some Windows 2019 systems can return -1 for the first few reads. - // Remember a -1 in case it never gets better. + // Some Windows systems can return -1 occasionally, at any time. + // Will fail if we never see good values. ex = new RuntimeException("getProcessCpuLoad() returns " + load + " which is not in the [0.0,1.0] interval"); } else if (load < 0.0 || load > 1.0) { @@ -54,6 +57,7 @@ public class GetProcessCpuLoad { } else { // A good reading: forget any previous -1. ex = null; + good++; } try { Thread.sleep(200); @@ -62,7 +66,8 @@ public class GetProcessCpuLoad { } } - if (ex != null) { + if (good == 0) { + // Delayed failure for Windows. throw ex; } } diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties b/test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties deleted file mode 100644 index 9ddb06fbbcb..00000000000 --- a/test/jdk/com/sun/management/OperatingSystemMXBean/TEST.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2025, 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. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -exclusiveAccess.dirs=.