Merge
authorctornqvi
Fri, 10 Apr 2015 15:18:45 +0000
changeset 30237 c901e751e681
parent 30235 000cc9f42b61 (current diff)
parent 30236 1b49e7ab091e (diff)
child 30238 4cb81d03d19f
Merge
--- a/hotspot/test/runtime/NMT/JcmdDetailDiff.java	Fri Apr 10 05:22:56 2015 -0700
+++ b/hotspot/test/runtime/NMT/JcmdDetailDiff.java	Fri Apr 10 15:18:45 2015 +0000
@@ -28,7 +28,6 @@
  * @library /testlibrary /../../test/lib
  * @modules java.base/sun.misc
  *          java.management
- * @ignore
  * @build JcmdDetailDiff
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff