# HG changeset patch
# User jwilhelm
# Date 1487712929 -3600
# Node ID f485e38a46854386d8cf0549660e4debbdb9ad30
# Parent  dc4eedadae1e2e6818d38ff7d9b8ac913af95007# Parent  5f1d97ac45959a8aa671e0711543f98996b042ff
Merge

diff -r dc4eedadae1e -r f485e38a4685 jdk/test/sun/management/jdp/DynamicLauncher.java
--- a/jdk/test/sun/management/jdp/DynamicLauncher.java	Sat Feb 18 03:23:29 2017 +0100
+++ b/jdk/test/sun/management/jdp/DynamicLauncher.java	Tue Feb 21 22:35:29 2017 +0100
@@ -58,6 +58,11 @@
                 }
             }
         } 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 -r dc4eedadae1e -r f485e38a4685 jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java
--- a/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java	Sat Feb 18 03:23:29 2017 +0100
+++ b/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java	Tue Feb 21 22:35:29 2017 +0100
@@ -40,7 +40,6 @@
     public static void main(String[] args) throws Exception {
         DynamicLauncher launcher = new JdpJmxRemoteDynamicPortTest();
         launcher.run();
-        launcher.getProcessOutpoutAnalyzer().stderrShouldNotContain("java.lang.Exception:");
     }
 
     protected String[] options() {