------------------------------------------------------------ revno: 1538 committer: James Hunt <[email protected]> branch nick: upstart timestamp: Wed 2013-10-02 09:59:20 +0100 message: * test/test_util_common.c: - set_upstart_session(): Call get_initctl_binary() rather than using define value. - get_initctl(): As above. - get_initctl_binary(): Check that file exists for parity with get_upstart_binary(). modified: ChangeLog test/test_util_common.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-10-01 15:29:59 +0000 +++ ChangeLog 2013-10-02 08:59:20 +0000 @@ -1,3 +1,12 @@ +2013-10-02 James Hunt <[email protected]> + + * test/test_util_common.c: + - set_upstart_session(): Call get_initctl_binary() rather than using + define value. + - get_initctl(): As above. + - get_initctl_binary(): Check that file exists for parity with + get_upstart_binary(). + 2013-10-01 James Hunt <[email protected]> * extra/upstart-file-bridge.c: === modified file 'test/test_util_common.c' --- test/test_util_common.c 2013-09-26 16:33:07 +0000 +++ test/test_util_common.c 2013-10-02 08:59:20 +0000 @@ -155,7 +155,7 @@ if (! getenv ("XDG_RUNTIME_DIR")) return FALSE; - cmd = nih_sprintf (NULL, "%s list-sessions 2>&1", INITCTL_BINARY); + cmd = nih_sprintf (NULL, "%s list-sessions 2>&1", get_initctl_binary ()); TEST_NE_P (cmd, NULL); /* We expect the list-sessions command to return a valid session @@ -351,7 +351,7 @@ int ret; ret = sprintf (path, "%s %s", - INITCTL_BINARY, + get_initctl_binary (), test_user_mode ? "--user" : "--session"); @@ -568,7 +568,11 @@ const char * get_initctl_binary (void) { - return INITCTL_BINARY; + static const char *initctl_binary = INITCTL_BINARY; + + TEST_TRUE (file_exists (initctl_binary)); + + return initctl_binary; } /**
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
