~jamesodhunt/upstart/allow-multiple-cmdline-confdirs.make-dist-merge-issue

Viewing all changes in revision 1474.

  • Committer: James Hunt
  • Date: 2013-05-30 13:14:49 UTC
  • Revision ID: james.hunt@ubuntu.com-20130530131449-rfvstbsqej1gvm1c
* init/Makefile.am: Added test_main.
* init/tests/test_main.c: New test.
* init/tests/test_job_process.c: strcmp_compar() moved to test_util.c.
* util/tests/test_initctl.c: strcmp_compar() removed.
* init/xdg.c: Disable loading of jobs from SYSTEM_USERCONFDIR if
  UPSTART_NO_SYSTEM_USERCONFDIR envvar set (required for testing).
* test/test_util.c: Added strcmp_compar() and get_session_file().
* util/tests/test_initctl.c: Use get_session_file().

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: