~jamesodhunt/upstart/bug-1123588-gcc-malloc-attribute

« back to all changes in this revision

Viewing changes to util/tests/test_initctl.c

  • Committer: James Hunt
  • Date: 2013-02-26 16:45:33 UTC
  • mfrom: (1436.1.1 upstart-fix-env-test)
  • Revision ID: james.hunt@ubuntu.com-20130226164533-q6cxi3x0fir5ekfg
Merge of lp:~stgraber/upstart/upstart-fix-env-test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
824
824
        NIH_MUST (nih_str_array_add (&args, NULL, NULL,
825
825
                                "--no-sessions"));
826
826
 
 
827
        NIH_MUST (nih_str_array_add (&args, NULL, NULL,
 
828
                                "--no-inherit-env"));
 
829
 
827
830
        if (confdir) {
828
831
                NIH_MUST (nih_str_array_add (&args, NULL, NULL,
829
832
                                        "--confdir"));