Merge
authorppunegov
Tue, 26 Apr 2016 20:55:39 +0200
changeset 38101 23e0d6ebaae3
parent 38098 76879a233e69 (current diff)
parent 38100 4bf25b54add8 (diff)
child 38102 839593075df1
Merge
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java	Tue Apr 26 17:46:36 2016 +0200
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java	Tue Apr 26 20:55:39 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:.