# HG changeset patch
# User gtriantafill
# Date 1409840077 14400
# Node ID 6640f982c1be8e6c3a49660fdb529c6cff560194
# Parent  f5164941749c99843917a8be7bb4c82b9b75931e
8054711: [TESTBUG] Enable NMT2 tests after NMT2 is integrated
Summary: enable tests for NMT2
Reviewed-by: ctornqvi, zgu

diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/AutoshutdownNMT.java
--- a/test/runtime/NMT/AutoshutdownNMT.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/AutoshutdownNMT.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Test for deprecated message if -XX:-AutoShutdownNMT is specified
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/BaselineWithParameter.java
--- a/test/runtime/NMT/BaselineWithParameter.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/BaselineWithParameter.java	Thu Sep 04 10:14:37 2014 -0400
@@ -27,7 +27,6 @@
  * @key nmt jcmd regression
  * @summary Regression test for invoking a jcmd with baseline=false, result was that the target VM crashed
  * @library /testlibrary
- * @ignore
  * @run main/othervm -XX:NativeMemoryTracking=detail BaselineWithParameter
  */
 
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/CommandLineDetail.java
--- a/test/runtime/NMT/CommandLineDetail.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/CommandLineDetail.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Running with NMT detail should not result in an error
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/CommandLineEmptyArgument.java
--- a/test/runtime/NMT/CommandLineEmptyArgument.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/CommandLineEmptyArgument.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Empty argument to NMT should result in an informative error message
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/CommandLineInvalidArgument.java
--- a/test/runtime/NMT/CommandLineInvalidArgument.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/CommandLineInvalidArgument.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Invalid argument to NMT should result in an informative error message
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/CommandLineSummary.java
--- a/test/runtime/NMT/CommandLineSummary.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/CommandLineSummary.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Running with NMT summary should not result in an error
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/CommandLineTurnOffNMT.java
--- a/test/runtime/NMT/CommandLineTurnOffNMT.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/CommandLineTurnOffNMT.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Turning off NMT should not result in an error
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/JcmdBaselineDetail.java
--- a/test/runtime/NMT/JcmdBaselineDetail.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/JcmdBaselineDetail.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @summary Verify that jcmd correctly reports that baseline succeeds with NMT enabled with detailed tracking.
  * @library /testlibrary
- * @ignore
  * @run main/othervm -XX:NativeMemoryTracking=detail JcmdBaselineDetail
  */
 
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/JcmdScale.java
--- a/test/runtime/NMT/JcmdScale.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/JcmdScale.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @summary Test the NMT scale parameter
  * @library /testlibrary
- * @ignore
  * @run main/othervm -XX:NativeMemoryTracking=summary JcmdScale
  */
 
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/JcmdScaleDetail.java
--- a/test/runtime/NMT/JcmdScaleDetail.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/JcmdScaleDetail.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @summary Test the NMT scale parameter with detail tracking level
  * @library /testlibrary
- * @ignore
  * @run main/othervm -XX:NativeMemoryTracking=detail JcmdScaleDetail
  */
 
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/JcmdSummaryDiff.java
--- a/test/runtime/NMT/JcmdSummaryDiff.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/JcmdSummaryDiff.java	Thu Sep 04 10:14:37 2014 -0400
@@ -27,7 +27,6 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build JcmdSummaryDiff
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary JcmdSummaryDiff
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/JcmdWithNMTDisabled.java
--- a/test/runtime/NMT/JcmdWithNMTDisabled.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/JcmdWithNMTDisabled.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @summary Verify that jcmd correctly reports that NMT is not enabled
  * @library /testlibrary
- * @ignore
  * First run without enabling NMT
  * @run main/othervm JcmdWithNMTDisabled
  * Then run with explicitly disabling NMT, should not be any difference
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/MallocRoundingReportTest.java
--- a/test/runtime/NMT/MallocRoundingReportTest.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/MallocRoundingReportTest.java	Thu Sep 04 10:14:37 2014 -0400
@@ -27,7 +27,6 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build MallocRoundingReportTest
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocRoundingReportTest
  *
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/MallocTestType.java
--- a/test/runtime/NMT/MallocTestType.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/MallocTestType.java	Thu Sep 04 10:14:37 2014 -0400
@@ -27,7 +27,6 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build MallocTestType
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/PrintNMTStatistics.java
--- a/test/runtime/NMT/PrintNMTStatistics.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/PrintNMTStatistics.java	Thu Sep 04 10:14:37 2014 -0400
@@ -28,7 +28,6 @@
  * @summary Make sure PrintNMTStatistics works on normal JVM exit
  * @library /testlibrary /testlibrary/whitebox
  * @build PrintNMTStatistics
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main PrintNMTStatistics
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
--- a/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt
  * @summary Trying to enable PrintNMTStatistics should result in a warning
  * @library /testlibrary
- * @ignore
  */
 
 import com.oracle.java.testlibrary.*;
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/ReleaseCommittedMemory.java
--- a/test/runtime/NMT/ReleaseCommittedMemory.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/ReleaseCommittedMemory.java	Thu Sep 04 10:14:37 2014 -0400
@@ -28,7 +28,6 @@
  * @key nmt regression
  * @library /testlibrary /testlibrary/whitebox
  * @build ReleaseCommittedMemory
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/ReleaseNoCommit.java
--- a/test/runtime/NMT/ReleaseNoCommit.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/ReleaseNoCommit.java	Thu Sep 04 10:14:37 2014 -0400
@@ -27,7 +27,6 @@
  * @key nmt regression
  * @library /testlibrary /testlibrary/whitebox
  * @build ReleaseNoCommit
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/ShutdownTwice.java
--- a/test/runtime/NMT/ShutdownTwice.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/ShutdownTwice.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @summary Run shutdown twice
  * @library /testlibrary
- * @ignore
  * @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice
  */
 
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/SummaryAfterShutdown.java
--- a/test/runtime/NMT/SummaryAfterShutdown.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/SummaryAfterShutdown.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @summary Verify that jcmd correctly reports that NMT is not enabled after a shutdown
  * @library /testlibrary
- * @ignore
  * @run main/othervm -XX:NativeMemoryTracking=detail SummaryAfterShutdown
  */
 
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/SummarySanityCheck.java
--- a/test/runtime/NMT/SummarySanityCheck.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/SummarySanityCheck.java	Thu Sep 04 10:14:37 2014 -0400
@@ -27,7 +27,6 @@
  * @summary Sanity check the output of NMT
  * @library /testlibrary /testlibrary/whitebox
  * @build SummarySanityCheck
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/ThreadedMallocTestType.java
--- a/test/runtime/NMT/ThreadedMallocTestType.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/ThreadedMallocTestType.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build ThreadedMallocTestType
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/ThreadedVirtualAllocTestType.java
--- a/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
  * @build ThreadedVirtualAllocTestType
- * @ignore
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
  */
diff -r f5164941749c -r 6640f982c1be test/runtime/NMT/VirtualAllocTestType.java
--- a/test/runtime/NMT/VirtualAllocTestType.java	Thu Aug 14 13:15:23 2014 -0400
+++ b/test/runtime/NMT/VirtualAllocTestType.java	Thu Sep 04 10:14:37 2014 -0400
@@ -26,7 +26,6 @@
  * @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly
  * @key nmt jcmd
  * @library /testlibrary /testlibrary/whitebox
- * @ignore
  * @build VirtualAllocTestType
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType