From a712ebbffb8031b4332657b1820f98298c8978aa Mon Sep 17 00:00:00 2001
From: Amit Sapre <amit.sapre@oracle.com>
Date: Tue, 21 Feb 2017 17:33:08 +0530
Subject: [PATCH] 8174915: Improve error handing for Jdp tests under
 sun/management/jdp

Added checks for abnormal exits of spawn process by test cases

Reviewed-by: dholmes, dfuchs, sspitsyn
---
 jdk/test/sun/management/jdp/DynamicLauncher.java             | 5 +++++
 jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jdk/test/sun/management/jdp/DynamicLauncher.java b/jdk/test/sun/management/jdp/DynamicLauncher.java
index 934002c056b..f55d0c8b671 100644
--- a/jdk/test/sun/management/jdp/DynamicLauncher.java
+++ b/jdk/test/sun/management/jdp/DynamicLauncher.java
@@ -58,6 +58,11 @@ public abstract class DynamicLauncher {
                 }
             }
         } while (tryAgain);
+        output.shouldHaveExitValue(0);
+        // java.lang.Exception is thrown by JdpTestCase if something goes wrong
+        // for instance - see JdpTestCase::shutdown()
+        output.shouldNotContain("java.lang.Exception:");
+        output.shouldNotContain("Error: Could not find or load main class");
     }
 
     protected OutputAnalyzer runVM() throws Exception {
diff --git a/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java b/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java
index d79e2245870..993cf930846 100644
--- a/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java
+++ b/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java
@@ -40,7 +40,6 @@ public class JdpJmxRemoteDynamicPortTest  extends DynamicLauncher {
     public static void main(String[] args) throws Exception {
         DynamicLauncher launcher = new JdpJmxRemoteDynamicPortTest();
         launcher.run();
-        launcher.getProcessOutpoutAnalyzer().stderrShouldNotContain("java.lang.Exception:");
     }
 
     protected String[] options() {