From 3d7f4a1bf85b06ffb9d91555824d343d06c6930b Mon Sep 17 00:00:00 2001
From: jbachorik <unknown>
Date: Tue, 24 Jun 2014 19:58:03 +0200
Subject: [PATCH] 8047073: Some javax/management/ fails with JFR Reviewed-by:
 egahlin, dfuchs

---
 test/javax/management/MBeanServer/MBeanFallbackTest.java | 3 +--
 test/javax/management/ObjectName/SerialCompatTest.java   | 4 +---
 test/javax/management/mxbean/MXBeanFallbackTest.java     | 3 +--
 test/javax/management/proxy/JMXProxyFallbackTest.java    | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/test/javax/management/MBeanServer/MBeanFallbackTest.java b/test/javax/management/MBeanServer/MBeanFallbackTest.java
index dcb5e1803..5fe115f7b 100644
--- a/test/javax/management/MBeanServer/MBeanFallbackTest.java
+++ b/test/javax/management/MBeanServer/MBeanFallbackTest.java
@@ -35,7 +35,7 @@ import javax.management.ObjectName;
  * @author Jaroslav Bachorik
  * @run clean MBeanFallbackTest
  * @run build MBeanFallbackTest
- * @run main MBeanFallbackTest
+ * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MBeanFallbackTest
  */
 public class MBeanFallbackTest {
     private static interface PrivateMBean {
@@ -51,7 +51,6 @@ public class MBeanFallbackTest {
     private static int failures = 0;
 
     public static void main(String[] args) throws Exception {
-        System.setProperty("jdk.jmx.mbeans.allowNonPublic", "true");
         testPrivate(PrivateMBean.class, new Private());
 
         if (failures == 0)
diff --git a/test/javax/management/ObjectName/SerialCompatTest.java b/test/javax/management/ObjectName/SerialCompatTest.java
index 50b65784a..0c183b204 100644
--- a/test/javax/management/ObjectName/SerialCompatTest.java
+++ b/test/javax/management/ObjectName/SerialCompatTest.java
@@ -28,7 +28,7 @@
  * @author Eamonn McManus, Daniel Fuchs
  * @run clean SerialCompatTest
  * @run build SerialCompatTest
- * @run main/othervm SerialCompatTest
+ * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true -Djmx.serial.form=1.0 SerialCompatTest
  */
 
 import java.io.*;
@@ -223,8 +223,6 @@ public class SerialCompatTest {
     }
 
     public static void main(String[] args) throws Exception {
-        System.setProperty("jmx.serial.form", "1.0");
-
         /* Check that we really are in jmx.serial.form=1.0 mode.
         The property is frozen the first time the ObjectName class
         is referenced so checking that it is set to the correct
diff --git a/test/javax/management/mxbean/MXBeanFallbackTest.java b/test/javax/management/mxbean/MXBeanFallbackTest.java
index 388ffc937..cd10b6f62 100644
--- a/test/javax/management/mxbean/MXBeanFallbackTest.java
+++ b/test/javax/management/mxbean/MXBeanFallbackTest.java
@@ -30,7 +30,7 @@
  * @author Jaroslav Bachorik
  * @run clean MXBeanFallbackTest
  * @run build MXBeanFallbackTest
- * @run main MXBeanFallbackTest
+ * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MXBeanFallbackTest
  */
 
 import javax.management.MBeanServer;
@@ -40,7 +40,6 @@ import javax.management.ObjectName;
 
 public class MXBeanFallbackTest {
     public static void main(String[] args) throws Exception {
-        System.setProperty("jdk.jmx.mbeans.allowNonPublic", "true");
         testPrivateMXBean("Private", new Private());
 
         if (failures == 0)
diff --git a/test/javax/management/proxy/JMXProxyFallbackTest.java b/test/javax/management/proxy/JMXProxyFallbackTest.java
index d1243593c..2d96d062b 100644
--- a/test/javax/management/proxy/JMXProxyFallbackTest.java
+++ b/test/javax/management/proxy/JMXProxyFallbackTest.java
@@ -36,7 +36,7 @@ import javax.management.ObjectName;
  * @author Jaroslav Bachorik
  * @run clean JMXProxyFallbackTest
  * @run build JMXProxyFallbackTest
- * @run main JMXProxyFallbackTest
+ * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true JMXProxyFallbackTest
  */
 public class JMXProxyFallbackTest {
     private static interface PrivateMBean {
@@ -56,7 +56,6 @@ public class JMXProxyFallbackTest {
     private static int failures = 0;
 
     public static void main(String[] args) throws Exception {
-        System.setProperty("jdk.jmx.mbeans.allowNonPublic", "true");
         testPrivate(PrivateMBean.class);
         testPrivate(PrivateMXBean.class);
 
-- 
GitLab