Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoriignatyev
Mon, 23 Dec 2013 18:39:47 +0000
changeset 22195 c39aa322d33a
parent 22193 530963406a44 (diff)
parent 22194 e4bef4b8cdb4 (current diff)
child 22196 b48393754f75
Merge
--- a/hotspot/test/runtime/NMT/CommandLineDetail.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/hotspot/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/hotspot/test/runtime/NMT/CommandLineSummary.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/hotspot/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/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/hotspot/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/hotspot/test/runtime/NMT/PrintNMTStatistics.java	Mon Dec 23 20:56:18 2013 +0400
+++ b/hotspot/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);
   }
 }
jdk-sandbox