From 0a6bc09a7cfd08d91815a5f4f6441a8e9dac7053 Mon Sep 17 00:00:00 2001
From: pliden <unknown>
Date: Tue, 15 Oct 2013 11:44:47 +0200
Subject: [PATCH] 8024634: gc/startup_warnings tests can fail due to unrelated
 warnings Reviewed-by: brutisso, jwilhelm, tamao

---
 test/gc/startup_warnings/TestCMS.java                       | 2 +-
 test/gc/startup_warnings/TestCMSNoIncrementalMode.java      | 2 +-
 test/gc/startup_warnings/TestG1.java                        | 2 +-
 test/gc/startup_warnings/TestParNewCMS.java                 | 2 +-
 test/gc/startup_warnings/TestParallelGC.java                | 2 +-
 test/gc/startup_warnings/TestParallelScavengeSerialOld.java | 2 +-
 test/gc/startup_warnings/TestSerialGC.java                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/gc/startup_warnings/TestCMS.java b/test/gc/startup_warnings/TestCMS.java
index 22a071957..93bb56311 100644
--- a/test/gc/startup_warnings/TestCMS.java
+++ b/test/gc/startup_warnings/TestCMS.java
@@ -38,7 +38,7 @@ public class TestCMS {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
diff --git a/test/gc/startup_warnings/TestCMSNoIncrementalMode.java b/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
index f2180904e..0d329fbe5 100644
--- a/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
+++ b/test/gc/startup_warnings/TestCMSNoIncrementalMode.java
@@ -37,7 +37,7 @@ public class TestCMSNoIncrementalMode {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseConcMarkSweepGC", "-XX:-CMSIncrementalMode", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
diff --git a/test/gc/startup_warnings/TestG1.java b/test/gc/startup_warnings/TestG1.java
index 536612bbc..b1dfaa427 100644
--- a/test/gc/startup_warnings/TestG1.java
+++ b/test/gc/startup_warnings/TestG1.java
@@ -37,7 +37,7 @@ public class TestG1 {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
diff --git a/test/gc/startup_warnings/TestParNewCMS.java b/test/gc/startup_warnings/TestParNewCMS.java
index f74d65c66..3f8bfb42d 100644
--- a/test/gc/startup_warnings/TestParNewCMS.java
+++ b/test/gc/startup_warnings/TestParNewCMS.java
@@ -38,7 +38,7 @@ public class TestParNewCMS {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParNewGC", "-XX:+UseConcMarkSweepGC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
diff --git a/test/gc/startup_warnings/TestParallelGC.java b/test/gc/startup_warnings/TestParallelGC.java
index 7a0766ebc..e21630913 100644
--- a/test/gc/startup_warnings/TestParallelGC.java
+++ b/test/gc/startup_warnings/TestParallelGC.java
@@ -38,7 +38,7 @@ public class TestParallelGC {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParallelGC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
diff --git a/test/gc/startup_warnings/TestParallelScavengeSerialOld.java b/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
index 27a25b23d..5d1cbddb0 100644
--- a/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
+++ b/test/gc/startup_warnings/TestParallelScavengeSerialOld.java
@@ -38,7 +38,7 @@ public class TestParallelScavengeSerialOld {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseParallelGC", "-XX:-UseParallelOldGC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
diff --git a/test/gc/startup_warnings/TestSerialGC.java b/test/gc/startup_warnings/TestSerialGC.java
index d84fd5d96..4ce1af2b4 100644
--- a/test/gc/startup_warnings/TestSerialGC.java
+++ b/test/gc/startup_warnings/TestSerialGC.java
@@ -38,7 +38,7 @@ public class TestSerialGC {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseSerialGC", "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
-    output.shouldNotContain("warning");
+    output.shouldNotContain("deprecated");
     output.shouldNotContain("error");
     output.shouldHaveExitValue(0);
   }
-- 
GitLab