Merge authors: Steve Langasek (vorlon) Related merge proposals: https://code.launchpad.net/~vorlon/upstart/lp.1254326/+merge/196428 proposed by: Steve Langasek (vorlon) review: Approve - Dmitrijs Ledkovs (xnox) ------------------------------------------------------------ revno: 1577 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Mon 2013-11-25 09:18:47 +0000 message: * Merge of lp:~vorlon/upstart/lp.1254326. modified: ChangeLog init/tests/test_state.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 'ChangeLog' --- ChangeLog 2013-11-18 10:31:21 +0000 +++ ChangeLog 2013-11-23 19:48:16 +0000 @@ -1,3 +1,11 @@ +2013-11-23 Steve Langasek <[email protected]> + + * init/tests/test_state.c: fix test case to not assume SIGUSR1 == 10; + the numeric value may vary between platforms, what we actually care + about is making sure that the deserialization output matches what + was in the json - so check the numeric value, NOT the symbolic + signal name. + 2013-11-16 Dmitrijs Ledkovs <[email protected]> * init/xdg.c, util/Makefile.am, test/Makefile.am, init/conf.c: === modified file 'init/tests/test_state.c' --- init/tests/test_state.c 2013-11-18 10:15:36 +0000 +++ init/tests/test_state.c 2013-11-23 19:48:16 +0000 @@ -4460,7 +4460,7 @@ NIH_HASH_FOREACH (job_classes, iter) { JobClass *class = (JobClass *)iter; if (strcmp (class->name, "whoopsie") == 0) { - TEST_EQ (class->reload_signal, SIGUSR1); + TEST_EQ (class->reload_signal, 10); } else TEST_EQ (class->reload_signal, SIGHUP); }
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
