Merge
authorrriggs
Thu, 17 Sep 2015 22:46:02 -0400
changeset 32659 52d938abd6ba
parent 32658 dc687d3e31ab (diff)
parent 32656 a76c2d877a16 (current diff)
child 32660 b5e9f5c24646
Merge
jdk/src/java.base/share/native/libfdlibm/e_pow.c
jdk/src/java.base/share/native/libfdlibm/w_pow.c
--- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java	Thu Sep 17 22:59:48 2015 +0100
+++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java	Thu Sep 17 22:46:02 2015 -0400
@@ -96,8 +96,6 @@
             ConcurrentHashMap<ProcessHandle, ProcessHandle> processes = new ConcurrentHashMap<>();
             List<ProcessHandle> children = getChildren(ProcessHandle.current());
             children.forEach(ProcessUtil::printProcess);
-            Assert.assertEquals(children.size(), 0,
-                    "Expected to start with zero children; " + children);
 
             JavaChild proc = JavaChild.spawnJavaChild("stdin");
             procHandle = proc.toHandle();
@@ -186,10 +184,6 @@
             children.forEach(p -> printProcess(p, "after onExit:"));
 
             Assert.assertEquals(proc.isAlive(), false, "destroyed process is alive:: %s%n" + proc);
-
-            List<ProcessHandle> children2 = getAllChildren(procHandle);
-            printf(" children2: %s%n", children2.toString());
-            Assert.assertEquals(children2.size(), 0, "After onExit, expected no children");
         } catch (IOException | InterruptedException ex) {
             Assert.fail(ex.getMessage());
         } finally {