changeset 16770:ed98f82f9256

Merge
author jwilhelm
date Tue, 21 Feb 2017 22:35:29 +0100
parents a4d094e7dd1f 0c6245916e47
children f21b6912d865
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/management/jdp/DynamicLauncher.java	Sat Feb 18 03:23:29 2017 +0100
+++ b/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 {
--- a/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java	Sat Feb 18 03:23:29 2017 +0100
+++ b/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() {