[Merge] lp:~jamesodhunt/upstart/allow-multiple-cmdline-confdirs into lp:upstart

[James Hunt]

Review: Resubmit

Agreed - new tests added (which necessitated creating test/test_util.[ch] for test code sharing). We now have a test_main test...


Testing --confdir command-line option handling
...Session Init without --confdir
...Session Init with --confdir
...Session Init with multiple --confdir
...Session Init with multiple --confdir and conflicting names
...System Init without --confdir
...System Init with --confdir
...System Init with multiple --confdir
...System Init with multiple --confdir and conflicting names
PASS: test_main
-- 
https://code.launchpad.net/~jamesodhunt/upstart/allow-multiple-cmdline-confdirs/+merge/156512
Your team Upstart Reviewers is subscribed to branch lp:upstart.