Merge authors: Stéphane Graber (stgraber) Related merge proposals: https://code.launchpad.net/~stgraber/upstart/upstart-tests-pty/+merge/140388 proposed by: Stéphane Graber (stgraber) ------------------------------------------------------------ revno: 1413 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Tue 2012-12-18 11:15:06 +0000 message: * Merge of lp:~stgraber/upstart/upstart-tests-pty. modified: init/tests/test_job_process.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/tests/test_job_process.c' --- init/tests/test_job_process.c 2012-12-17 11:27:01 +0000 +++ init/tests/test_job_process.c 2012-12-18 11:02:00 +0000 @@ -9198,6 +9198,8 @@ io_error_handler, NULL); TEST_NE_P (io, NULL); + ret = nih_main_loop (); + /* wait for child to finish */ TEST_EQ (waitpid (pid, &status, 0), pid); @@ -9207,7 +9209,6 @@ WIFSTOPPED (status) ? WSTOPSIG (status) : EXIT_FAILURE; - ret = nih_main_loop (); exit (exit_status ? exit_status : ret); }
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
