8316447: 8 sun/management/jmxremote tests ignore VM flags

Reviewed-by: kevinw, sspitsyn

Author: lmesnik

test/jdk/sun/management/jmxremote/bootstrap/AbstractFilePermissionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -173,8 +173,7 @@ private int doTest() throws Exception {
             command.add(className);
 
 
-            ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(
-                    command.toArray(new String[command.size()]));
+            ProcessBuilder processBuilder = ProcessTools.createTestJvm(command);
 
             System.out.println("test cmdline: " + Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
             OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);

test/jdk/sun/management/jmxremote/bootstrap/CustomLauncherTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -95,9 +95,7 @@ public static void main(String[] args) throws Exception {
             System.out.println("  PID           : " + serverPrc.pid());
             System.out.println("  shutdown port : " + port.get());
 
-            ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
-                "-cp",
-                Utils.TEST_CLASS_PATH,
+            ProcessBuilder client = ProcessTools.createTestJvm(
                 "--add-exports", "jdk.management.agent/jdk.internal.agent=ALL-UNNAMED",
                 "TestManager",
                 String.valueOf(serverPrc.pid()),

test/jdk/sun/management/jmxremote/bootstrap/JMXAgentInterfaceBinding.java

@@ -230,12 +230,10 @@ private static class MainThread extends Thread {
         private static final String EXP_TERM_MSG_REG = "Exit: ([0-9]+)";
         private static final Pattern EXIT_PATTERN = Pattern.compile(EXP_TERM_MSG_REG);
         private static final String COOP_EXIT = "MainThread: Cooperative Exit";
-        private static final int WAIT_FOR_JMX_AGENT_TIMEOUT_MS = 20_000;
         private final String addr;
         private final int jmxPort;
         private final int rmiPort;
         private final boolean useSSL;
-        private boolean jmxAgentStarted = false;
         private volatile Exception excptn;
 
         private MainThread(InetAddress bindAddress, int jmxPort, int rmiPort, boolean useSSL) {
@@ -269,20 +267,12 @@ private void waitUntilReadyForConnections() {
             JMXConnectorThread connectionTester = new JMXConnectorThread(
                     addr, jmxPort, rmiPort, useSSL, latch);
             connectionTester.start();
-            boolean expired = false;
             try {
-                expired = !latch.await(WAIT_FOR_JMX_AGENT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-                System.out.println(
-                        "MainThread: Finished waiting for JMX agent to become available: expired == "
-                                + expired);
-                jmxAgentStarted = !expired;
+                latch.await();
+                System.out.println("MainThread: Finished waiting for JMX agent to become available.");
             } catch (InterruptedException e) {
                 throw new RuntimeException("Test failed", e);
             }
-            if (!jmxAgentStarted) {
-                throw new RuntimeException(
-                        "Test failed. JMX server agents not becoming available.");
-            }
             if (connectionTester.isFailed()
                     || !connectionTester.jmxConnectionWorked()
                     || !connectionTester.rmiConnectionWorked()) {

test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java

@@ -42,7 +42,7 @@
  * @modules java.management.rmi
  *
  * @build JMXAgentInterfaceBinding
- * @run main/timeout=60 JMXInterfaceBindingTest
+ * @run main JMXInterfaceBindingTest
  */
 public class JMXInterfaceBindingTest {
 
@@ -65,7 +65,6 @@ public class JMXInterfaceBindingTest {
                                                 "ssl" +
                                                 File.separator +
                                                 "truststore";
-    public static final String TEST_CLASSPATH = System.getProperty("test.classes", ".");
 
     public void run(List<InetAddress> addrs) {
         System.out.println("DEBUG: Running tests with plain sockets.");
@@ -198,8 +197,6 @@ private Process createTestProcess() {
                             " == (%s,%d,%d)", address, jmxPort, rmiPort);
             System.out.println(msg);
             List<String> args = new ArrayList<>();
-            args.add("-classpath");
-            args.add(TEST_CLASSPATH);
             args.add("-Dcom.sun.management.jmxremote.host=" + address);
             args.add("-Dcom.sun.management.jmxremote.port=" + jmxPort);
             args.add("-Dcom.sun.management.jmxremote.rmi.port=" + rmiPort);
@@ -221,7 +218,7 @@ private Process createTestProcess() {
             args.add(Boolean.toString(useSSL));
 
             try {
-                ProcessBuilder builder = ProcessTools.createJavaProcessBuilder(args.toArray(new String[]{}));
+                ProcessBuilder builder = ProcessTools.createTestJvm(args.toArray(new String[]{}));
                 System.out.println(ProcessTools.getCommandLine(builder));
                 Process process = builder.start();
                 output = new OutputAnalyzer(process);

test/jdk/sun/management/jmxremote/bootstrap/LocalManagementTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -107,7 +107,7 @@ private static boolean doTest(String testId, String arg) throws Exception {
             args.add(arg);
         }
         args.add("TestApplication");
-        ProcessBuilder server = ProcessTools.createJavaProcessBuilder(
+        ProcessBuilder server = ProcessTools.createTestJvm(
             args.toArray(new String[args.size()])
         );
 
@@ -133,7 +133,7 @@ private static boolean doTest(String testId, String arg) throws Exception {
             System.out.println("  PID           : " + serverPrc.pid());
             System.out.println("  shutdown port : " + port.get());
 
-            ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
+            ProcessBuilder client = ProcessTools.createTestJvm(
                 "-cp",
                 TEST_CLASSPATH,
                 "--add-exports", "jdk.management.agent/jdk.internal.agent=ALL-UNNAMED",

test/jdk/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, 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
@@ -188,7 +188,7 @@ private int doTest(String... args) throws Exception {
             command.add(TEST_CLASS_PATH);
             command.add(className);
 
-            ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(command.toArray(new String[command.size()]));
+            ProcessBuilder processBuilder = ProcessTools.createTestJvm(command);
 
             OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
 

test/jdk/sun/management/jmxremote/startstop/JMXStartStopTest.java

@@ -391,18 +391,14 @@ public synchronized void stop()
     private static TestAppRun doTest(String name, String ... args)
             throws Exception {
         List<String> pbArgs = new ArrayList<>(Arrays.asList(
-                "-cp",
-                System.getProperty("test.class.path"),
                 "-Duser.language=en",
                 "-Duser.country=US",
                 "-XX:+UsePerfData"
         ));
         pbArgs.addAll(Arrays.asList(args));
         pbArgs.add(TEST_APP_NAME);
 
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-                pbArgs.toArray(new String[pbArgs.size()])
-        );
+        ProcessBuilder pb = ProcessTools.createTestJvm(pbArgs);
         TestAppRun s = new TestAppRun(pb, name);
         s.start();
         return s;

test/jdk/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, 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
@@ -59,9 +59,8 @@ public class JMXStatusPerfCountersTest {
 
     @BeforeClass
     public static void setupClass() throws Exception {
-        testAppPb = ProcessTools.createJavaProcessBuilder(
+        testAppPb = ProcessTools.createTestJvm(
             "-XX:+UsePerfData",
-            "-cp", System.getProperty("test.class.path"),
             TEST_APP_NAME
         );
     }

test/jdk/sun/management/jmxremote/startstop/JMXStatusTest.java

@@ -84,12 +84,10 @@ abstract public class JMXStatusTest {
     @BeforeTest
     public final void setup() throws Exception {
         List<String> args = new ArrayList<>();
-        args.add("-cp");
-        args.add(System.getProperty("test.class.path"));
         args.add("-XX:+UsePerfData");
         args.addAll(getCustomVmArgs());
         args.add(TEST_APP_NAME);
-        testAppPb = ProcessTools.createJavaProcessBuilder(args.toArray(new String[args.size()]));
+        testAppPb = ProcessTools.createTestJvm(args);
 
         jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
     }