changeset 14184:5b0fbe224dff

Merge
author iignatyev
date Mon, 23 Dec 2013 18:39:47 +0000
parents 21db9a1d43ef (diff) 6c583aa36bc9 (current diff)
children a9683a647c9f
files
diffstat 4 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/test/runtime/NMT/CommandLineDetail.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/test/runtime/NMT/CommandLineDetail.java	Mon Dec 23 18:39:47 2013 +0000
@@ -24,7 +24,7 @@
  /*
  * @test
  * @key nmt
- * @summary Running with NMT detail should not result in an error or warning
+ * @summary Running with NMT detail should not result in an error
  * @library /testlibrary
  */
 
@@ -39,7 +39,6 @@
       "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
     output.shouldNotContain("error");
-    output.shouldNotContain("warning");
     output.shouldHaveExitValue(0);
   }
 }
--- a/test/runtime/NMT/CommandLineSummary.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/test/runtime/NMT/CommandLineSummary.java	Mon Dec 23 18:39:47 2013 +0000
@@ -24,7 +24,7 @@
  /*
  * @test
  * @key nmt
- * @summary Running with NMT summary should not result in an error or warning
+ * @summary Running with NMT summary should not result in an error
  * @library /testlibrary
  */
 
@@ -39,7 +39,6 @@
       "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
     output.shouldNotContain("error");
-    output.shouldNotContain("warning");
     output.shouldHaveExitValue(0);
   }
 }
--- a/test/runtime/NMT/CommandLineTurnOffNMT.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/test/runtime/NMT/CommandLineTurnOffNMT.java	Mon Dec 23 18:39:47 2013 +0000
@@ -24,7 +24,7 @@
  /*
  * @test
  * @key nmt
- * @summary Turning off NMT should not result in an error or warning
+ * @summary Turning off NMT should not result in an error
  * @library /testlibrary
  */
 
@@ -38,7 +38,6 @@
               "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
     output.shouldNotContain("error");
-    output.shouldNotContain("warning");
     output.shouldHaveExitValue(0);
   }
 }
--- a/test/runtime/NMT/PrintNMTStatistics.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/test/runtime/NMT/PrintNMTStatistics.java	Mon Dec 23 18:39:47 2013 +0000
@@ -64,7 +64,6 @@
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
     output.shouldContain("Java Heap (reserved=");
     output.shouldNotContain("error");
-    output.shouldNotContain("warning");
     output.shouldHaveExitValue(0);
   }
 }