Merge
authorppunegov
Tue, 26 Apr 2016 18:54:37 +0200
changeset 38100 4bf25b54add8
parent 38096 cc22ef000685 (current diff)
parent 38099 22b90fb013a0 (diff)
child 38101 23e0d6ebaae3
Merge
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java	Tue Apr 26 15:45:20 2016 +0000
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java	Tue Apr 26 18:54:37 2016 +0200
@@ -51,7 +51,7 @@
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  *
- * @run main/othervm/timeout=240  -Xms256M -Xmx256M -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ * @run main/othervm/timeout=240  -Xms256M -Xmx256M -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                                gc.g1.humongousObjects.ClassLoaderGenerator 1
  *
  * @run main/othervm -Xms256M -Xmx256M -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.