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

[James Hunt]

This change is required for the upcoming test framework since it is necessary to allow a Session Init to operate in a known environment (crucially without loading in all the standard Session Jobs provided on, for example, an Ubuntu Raring system).

Note this introduces a small behavioural change in that now if --confdir is specified one or more times for a Session Init, *only* those directories specified will be used (whereas before the single confdir specified would be prepended to the standard list of directories searched).

= Future Work =

It might be worth adding the ability for the list of directories being used to be queried both via a new initctl command (for a running instance), and via an init option to see what user directories *would* be used.

= Change Summary =

* init/main.c:
  - main(): Allow Session Init to accept multiple --confdir values,
    which replace all built-in values (behaviour required for testing).
  - handle_confdir(): Operate on conf_dirs array rather than single
    conf_dir value.
  - conf_dir_setter(): Command-line setter function to add configuration
    file directories to conf_dirs array.
* init/man/init.8: Update on --confdir behaviour.

[Dimitri John Ledkov (xnox)]

On 2 April 2013 11:31, James Hunt <email address hidden> wrote:
>
> === modified file 'init/main.c'
> --- init/main.c 2013-03-01 15:13:54 +0000
> +++ init/main.c 2013-04-02 10:30:30 +0000
> @@ -88,6 +88,7 @@
> static void handle_confdir (void);
> static void handle_logdir (void);
> static int console_type_setter (NihOption *option, const char *arg);
> +static int conf_dir_setter (NihOption *option, const char *arg);
>
>
> /**
> @@ -99,12 +100,11 @@
> static int state_fd = -1;
>
> /**
> - * conf_dir:
> - *
> - * Full path to job configuration file directory.
> - *
> + * conf_dirs:
> + *
> + * Array of full paths to job configuration file directories.
> **/
> -static char *conf_dir = NULL;
> +static char **conf_dirs = NULL;
>
> /**
> * initial_event:
> @@ -136,7 +136,7 @@
> **/
> static NihOption options[] = {
> { 0, "confdir", N_("specify alternative directory to load configuration files from"),
> - NULL, "DIR", &conf_dir, NULL },
> + NULL, "DIR", NULL, conf_dir_setter },
>
> { 0, "default-console", N_("default value for console stanza"),
> NULL, "VALUE", NULL, console_type_setter },
> @@ -185,9 +185,10 @@
> char *argv[])
> {
> char **args = NULL;
> - char **dirs = NULL;
> int ret;
>
> + conf_dirs = NIH_MUST (nih_str_array_new (NULL));
> +
> args_copy = NIH_MUST (nih_str_array_copy (NULL, NULL, argv));
>
> nih_main_init (args_copy[0]);
> @@ -532,19 +533,38 @@
> }
>
> /* Read configuration */
> - if (! user_mode)
> + if (! user_mode) {
> + char *conf_dir;
> + int len = 0;
> +
> + nih_assert (conf_dirs[0]);
> +
> + /* Count entries */
> + for (char **d = conf_dirs; d && *d; d++, len++)
> + ;
> +
> + nih_assert (len);
> +
> + /* Use last value specified */
> + conf_dir = conf_dirs[len-1];
> +
> NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
>
> - if (conf_dir)
> + nih_debug ("Using configuration directory %s", conf_dir);
> NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
> + } else {
> + nih_local char **dirs = NULL;
>
> - if (user_mode) {
> dirs = NIH_MUST (get_user_upstart_dirs ());
> - for (char **d = dirs; d && *d; d++)
> +
> + for (char **d = conf_dirs[0] ? conf_dirs : dirs; d && *d; d++) {
> + nih_debug ("Using configuration directory %s", *d);
> NIH_MUST (conf_source_new (NULL, *d, CONF_JOB_DIR));
> - nih_free (dirs);
> + }
> }
>
> + nih_free (conf_dirs);
> +

Why not allow "system" init to have mulple conf_dirs as well?
Or was it intentional to preserve previous behaviour (last one wins)?
I'm not sure it's worth preserving the behaviour, and I think it is
useful to support multiple confdirs even for system init. It has a
usecase in the phablet / cloud scenarios where rootfs can be read-only
and the res...

[James Hunt (jamesodhunt)]

That's a good question. Yes, this was designed as a minimal change to retain existing behaviour when running as PID 1.

Whilst I'd rather we don't encourage use of --confdir for PID 1, the fact that the option is already there and allows for a custom location today, maybe we should consider allowing this.

That said, allowing multiple conf dirs for PID 1 does increase the foot-shooting ability slightly should one or more of those locations not be available at startup time resulting in a broken boot. By specifying a single --confdir directory, it'll be immediately obvious if that directory is not available at startup (as the system will never boot). Whereas with multiple ---confdirs, it may be less so. Added to which, talk of overlays reminds me of the still-outstanding kernel bug 882147.

[Stéphane Graber (stgraber)]

I think the change looks good and agree that it's probably a good idea to limit this to Session Init for now.

Should we have some tests for this? I'd think the following cases would be good to test:
 - User, no --confdir => loads all jobs from default paths
 - User, --confdir a => only loads jobs from "a"
 - User, --confdir a --confdir b => loads jobs from "a" and "b"
 - System, no --confdir => loads all jobs from default path
 - System, --confdir a => loads all jobs from "a"
 - System, --confdir a --confdir b => loads all jobs from "b"

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

1473. By James Hunt on 2013-05-30

* Makefile.am: Added 'test'.
* configure.ac: Added 'test/Makefile'.
* init/Makefile.am: Depend on test_util archive rather than source
  files.
* init/state.c: Added missing config.h include.
* util/Makefile.am: Depend on test_util archive rather than source
  files.
* util/tests/test_initctl.c: Moved common utility code to
  test/test_util.c and replaced INITCTL_BINARY by get_initctl_binary().
* test/test_util.[ch]: New location for init/tests/test_util.[ch] to
  allow all tests access to common functionality.

1474. By James Hunt on 2013-05-30

* 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().

[James Hunt (jamesodhunt)]

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

review: Needs Resubmitting

[Dimitri John Ledkov (xnox)]

The new tests look good to me & pass here.
Merging into trunk results in bzr conflicts, so please resolve them yourself. Apart from that, approved.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-28 15:12:19 +0000
+++ ChangeLog	2013-05-30 13:17:28 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2013-05-27  Marc Deslauriers  <[e-mail]>
 
 	* init/job.c: Don't check for user mode when trying to load an
@@ -88,6 +89,44 @@
 	  - Corrected bridge name.
 	  - Explain that blocking semantics of system jobs not retained.
 
+=======
[phone]  James Hunt  <[e-mail]>
+
+	* 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().
+
[phone]  James Hunt  <[e-mail]>
+
+	* Makefile.am: Added 'test'.
+	* configure.ac: Added 'test/Makefile'.
+	* init/Makefile.am: Depend on test_util archive rather than source
+	  files.
+	* init/state.c: Added missing config.h include.
+	* util/Makefile.am: Depend on test_util archive rather than source
+	  files.
+	* util/tests/test_initctl.c: Moved common utility code to
+	  test/test_util.c and replaced INITCTL_BINARY by get_initctl_binary().
+	* test/test_util.[ch]: New location for init/tests/test_util.[ch] to
+	  allow all tests access to common functionality.
+
[phone]  James Hunt  <[e-mail]>
+
+	* init/main.c:
+	  - main(): Allow Session Init to accept multiple --confdir values,
+	    which replace all built-in values (behaviour required for testing).
+	  - handle_confdir(): Operate on conf_dirs array rather than single
+	    conf_dir value.
+	  - conf_dir_setter(): Command-line setter function to add configuration
+	    file directories to conf_dirs array.
+	* init/man/init.8: Update on --confdir behaviour.
+
+>>>>>>> MERGE-SOURCE
 2013-03-28  James Hunt  <[e-mail]>
 
 	* scripts/upstart-monitor.py: on_button_press_event():

=== modified file 'Makefile.am'
--- Makefile.am	2013-03-04 11:44:49 +0000
+++ Makefile.am	2013-05-30 13:17:28 +0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl dbus init util extra conf doc contrib po scripts
+SUBDIRS = test intl dbus init util extra conf doc contrib po scripts
 
 EXTRA_DIST = HACKING
 

=== modified file 'configure.ac'
--- configure.ac	2013-03-22 14:34:15 +0000
+++ configure.ac	2013-05-30 13:17:28 +0000
@@ -101,6 +101,6 @@
 AC_CONFIG_FILES([ Makefile intl/Makefile
 		  dbus/Makefile init/Makefile util/Makefile conf/Makefile
 		  extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in
-		  scripts/Makefile scripts/data/Makefile ])
+		  scripts/Makefile scripts/data/Makefile test/Makefile ])
 AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT

=== modified file 'init/Makefile.am'
--- init/Makefile.am	2013-05-15 13:21:54 +0000
+++ init/Makefile.am	2013-05-30 13:17:28 +0000
@@ -16,8 +16,8 @@
 	-DCONFDIR="\"$(initconfdir)\"" \
 	-DSBINDIR="\"$(sbindir)\"" \
 	-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
-	-I$(top_srcdir)/intl
-
+	-I$(top_srcdir)/intl \
+	-I$(top_srcdir)/test -iquote$(top_srcdir)/test
 
 dist_man_MANS = \
 	man/init.8 \
@@ -137,9 +137,14 @@
 TEST_DATA_FILES = \
 	$(TEST_DATA_DIR)/upstart-1.6.json
 
+<<<<<<< TREE
 test_util_SOURCES = \
 	tests/test_util.c tests/test_util.h
 
+=======
+EXTRA_DIST = init.supp $(TEST_DATA_FILES)
+
+>>>>>>> MERGE-SOURCE
 TESTS = \
 	test_system \
 	test_environ \
@@ -156,7 +161,8 @@
 	test_parse_conf \
 	test_conf_static \
 	test_xdg \
-	test_control
+	test_control \
+	test_main
 
 EXTRA_DIST = init.supp $(TEST_DATA_FILES) tests/test_conf_preload.sh.in
 
@@ -182,7 +188,7 @@
 	environ.o \
 	$(NIH_LIBS)
 
-test_process_SOURCES = tests/test_process.c $(test_util_SOURCES)
+test_process_SOURCES = tests/test_process.c
 test_process_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -190,6 +196,7 @@
 	session.o log.o state.o xdg.o apparmor.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
@@ -210,7 +217,7 @@
 	$(JSON_LIBS) \
 	-lrt
 
-test_job_process_SOURCES = tests/test_job_process.c $(test_util_SOURCES)
+test_job_process_SOURCES = tests/test_job_process.c
 test_job_process_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -218,6 +225,7 @@
 	session.o log.o state.o xdg.o apparmor.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
@@ -238,7 +246,7 @@
 	$(JSON_LIBS) \
 	-lrt
 
-test_log_SOURCES = tests/test_log.c $(test_util_SOURCES)
+test_log_SOURCES = tests/test_log.c
 test_log_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -246,13 +254,14 @@
 	session.o log.o state.o xdg.o apparmor.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
 	$(JSON_LIBS) \
 	-lrt -lutil
 
-test_state_SOURCES = tests/test_state.c $(test_util_SOURCES)
+test_state_SOURCES = tests/test_state.c
 test_state_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -260,6 +269,7 @@
 	session.o log.o state.o xdg.o apparmor.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
@@ -336,12 +346,16 @@
 	$(JSON_LIBS) \
 	-lrt
 
+<<<<<<< TREE
 check_LTLIBRARIES = tests/libwrap_inotify.la
 tests_libwrap_inotify_la_SOURCES = tests/wrap_inotify.c
 tests_libwrap_inotify_la_LIBADD = -lrt -ldl $(AM_LIBADD)
 tests_libwrap_inotify_la_LDFLAGS = avoid-version -module -shared -export-dynamic -rpath /nowhere -ldl
 
 test_conf_SOURCES = tests/test_conf.c $(test_util_SOURCES) $(check_LTLIBRARIES)
+=======
+test_conf_SOURCES = tests/test_conf.c
+>>>>>>> MERGE-SOURCE
 test_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -349,6 +363,7 @@
 	session.o log.o state.o xdg.o apparmor.o \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
@@ -390,6 +405,20 @@
 	$(JSON_LIBS) \
 	-lrt
 
+test_main_SOURCES = tests/test_main.c
+test_main_LDADD = \
+	system.o environ.o process.o \
+	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
+	parse_job.o parse_conf.o conf.o control.o quiesce.o \
+	session.o log.o state.o xdg.o \
+	com.ubuntu.Upstart.o \
+	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
+	$(NIH_LIBS) \
+	$(NIH_DBUS_LIBS) \
+	$(DBUS_LIBS) \
+	$(JSON_LIBS) \
+	-lrt
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(initconfdir)

=== modified file 'init/main.c'
--- init/main.c	2013-04-22 10:30:09 +0000
+++ init/main.c	2013-05-30 13:17:28 +0000
@@ -88,6 +88,7 @@
 static void handle_confdir      (void);
 static void handle_logdir       (void);
 static int  console_type_setter (NihOption *option, const char *arg);
+static int  conf_dir_setter     (NihOption *option, const char *arg);
 
 
 /**
@@ -99,12 +100,11 @@
 static int state_fd = -1;
 
 /**
- * conf_dir:
- *
- * Full path to job configuration file directory.
- *
+ * conf_dirs:
+ *
+ * Array of full paths to job configuration file directories.
  **/
-static char *conf_dir = NULL;
+static char **conf_dirs = NULL;
 
 /**
  * initial_event:
@@ -136,7 +136,7 @@
  **/
 static NihOption options[] = {
 	{ 0, "confdir", N_("specify alternative directory to load configuration files from"),
-		NULL, "DIR", &conf_dir, NULL },
+		NULL, "DIR", NULL, conf_dir_setter },
 
 	{ 0, "default-console", N_("default value for console stanza"),
 		NULL, "VALUE", NULL, console_type_setter },
@@ -185,9 +185,10 @@
       char *argv[])
 {
 	char **args = NULL;
-	char **dirs = NULL;
 	int    ret;
 
+	conf_dirs = NIH_MUST (nih_str_array_new (NULL));
+
 	args_copy = NIH_MUST (nih_str_array_copy (NULL, NULL, argv));
 
 	nih_main_init (args_copy[0]);
@@ -532,19 +533,38 @@
 	}
 
 	/* Read configuration */
-	if (! user_mode)
+	if (! user_mode) {
+		char   *conf_dir;
+		int     len = 0;
+
+		nih_assert (conf_dirs[0]);
+
+		/* Count entries */
+		for (char **d = conf_dirs; d && *d; d++, len++)
+			;
+
+		nih_assert (len);
+
+		/* Use last value specified */
+		conf_dir = conf_dirs[len-1];
+
 		NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
 
-	if (conf_dir)
+		nih_debug ("Using configuration directory %s", conf_dir);
 		NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
+	} else {
+		nih_local char **dirs = NULL;
 
-	if (user_mode) {
 		dirs = NIH_MUST (get_user_upstart_dirs ());
-		for (char **d = dirs; d && *d; d++)
+
+		for (char **d = conf_dirs[0] ? conf_dirs : dirs; d && *d; d++) {
+			nih_debug ("Using configuration directory %s", *d);
 			NIH_MUST (conf_source_new (NULL, *d, CONF_JOB_DIR));
-		nih_free (dirs);
+		}
 	}
 
+	nih_free (conf_dirs);
+
 	job_class_environment_init ();
 
 	conf_reload ();
@@ -922,31 +942,26 @@
 /**
  * handle_confdir:
  *
- * Determine where system configuration files should be loaded from.
+ * Determine where system configuration files should be loaded from
+ * if not specified on the command-line.
  **/
 static void
 handle_confdir (void)
 {
-	char *dir;
+	char  *dir;
+
+	nih_assert (conf_dirs);
 
 	/* user has already specified directory on command-line */
-	if (conf_dir)
-		goto out;
+	if (conf_dirs[0])
+		return;
 
 	if (user_mode)
 		return;
 
-	conf_dir = CONFDIR;
-
 	dir = getenv (CONFDIR_ENV);
-	if (! dir)
-		return;
-
-	conf_dir = dir;
-
-out:
-	nih_debug ("Using alternate configuration directory %s",
-			conf_dir);
+
+	NIH_MUST (nih_str_array_add (&conf_dirs, NULL, NULL, dir ? dir : CONFDIR));
 }
 
 /**
@@ -1001,3 +1016,20 @@
 
 	 return 0;
 }
+
+/**  
+ * NihOption setter function to handle selection of configuration file
+ * directories.
+ *
+ * Returns: 0 on success, -1 on invalid console type.
+ **/
+static int
+conf_dir_setter (NihOption *option, const char *arg)
+{
+	nih_assert (conf_dirs);
+	nih_assert (option);
+
+	NIH_MUST (nih_str_array_add (&conf_dirs, NULL, NULL, arg));
+
+	return 0;
+}

=== modified file 'init/man/init.8'
--- init/man/init.8	2013-02-25 09:42:11 +0000
+++ init/man/init.8	2013-05-30 13:17:28 +0000
@@ -65,10 +65,13 @@
 .\"
 .TP
 .B \-\-confdir \fIdirectory\fP
-Read job configuration files from a directory other than
-\fI/etc/init\fP.
-For user session mode, read job configuration files from this
-directory at highest priority.
+Read job configuration files from a directory other than the default
+(\fI/etc/init\fP for process ID 1).
+
+When running as process ID 1, the last directory specified will be used.
+
+In user session mode, multiple directories will be honoured and job
+configuration files loaded from the directories in the order specified.
 .\"
 .TP
 .B \-\-default-console \fIvalue\fP

=== modified file 'init/state.c'
--- init/state.c	2013-02-28 16:40:36 +0000
+++ init/state.c	2013-05-30 13:17:28 +0000
@@ -19,6 +19,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */    
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>

=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2012-12-19 12:16:59 +0000
+++ init/tests/test_job_process.c	2013-05-30 13:17:28 +0000
@@ -166,12 +166,6 @@
 	return 1;
 }
 
-static int
-strcmp_compar (const void *a, const void *b)
-{
-	return strcmp(*(char * const *)a, *(char * const *)b);
-}
-
 static void
 child (enum child_tests  test,
        const char       *filename)

=== added file 'init/tests/test_main.c'
--- init/tests/test_main.c	1970-01-01 00:00:00 +0000
+++ init/tests/test_main.c	2013-05-30 13:17:28 +0000
@@ -0,0 +1,452 @@
+/* upstart
+ *
+ * test_main.c - test suite for init/main.c
+ *
+ * Copyright © 2013 Canonical Ltd.
+ * Author: James Hunt <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <nih/string.h>
+#include <nih/main.h>
+#include <nih/test.h>
+
+#include <limits.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "conf.h"
+#include "job_class.h"
+#include "job.h"
+#include "xdg.h"
+
+#include "test_util.h"
+
+
+void
+test_confdir (void)
+{
+	char             confdir_a[PATH_MAX];
+	char             confdir_b[PATH_MAX];
+	char             xdg_config_home[PATH_MAX];
+	char             xdg_runtime_dir[PATH_MAX];
+	char             logdir[PATH_MAX];
+	pid_t            upstart_pid = 0;
+	pid_t            dbus_pid = 0;
+	char           **output;
+	size_t           lines;
+	nih_local char  *cmd = NULL;
+	nih_local char  *orig_xdg_config_home = NULL;
+	nih_local char  *orig_xdg_runtime_dir = NULL;
+	nih_local char  *xdg_conf_dir = NULL;
+	nih_local char  *session_file = NULL;
+	nih_local char  *path = NULL;
+
+	/* space for 2 sets of confdir options and a terminator */
+	char            *extra[5];
+
+	TEST_GROUP ("--confdir command-line option handling");
+
+	TEST_FILENAME (confdir_a);
+	assert0 (mkdir (confdir_a, 0755));
+
+	TEST_FILENAME (confdir_b);
+	assert0 (mkdir (confdir_b, 0755));
+
+	TEST_FILENAME (xdg_config_home);
+	assert0 (mkdir (xdg_config_home, 0755));
+
+	TEST_FILENAME (xdg_runtime_dir);
+	assert0 (mkdir (xdg_runtime_dir, 0755));
+
+	xdg_conf_dir = nih_sprintf (NULL, "%s/%s", xdg_config_home, "upstart");
+	TEST_NE_P (xdg_conf_dir, NULL);
+	assert0 (mkdir (xdg_conf_dir, 0755));
+
+	TEST_FILENAME (logdir);
+	assert0 (mkdir (logdir, 0755));
+
+	/* Take care to avoid disrupting users environment by saving and
+	 * restoring these variable (assuming the tests all pass...).
+	 */
+	orig_xdg_config_home = getenv ("XDG_CONFIG_HOME");
+	if (orig_xdg_config_home)
+		orig_xdg_config_home = NIH_MUST (nih_strdup (NULL, orig_xdg_config_home));
+
+	assert0 (setenv ("XDG_CONFIG_HOME", xdg_config_home, 1));
+
+	orig_xdg_runtime_dir = getenv ("XDG_RUNTIME_DIR");
+	if (orig_xdg_runtime_dir)
+		orig_xdg_runtime_dir = NIH_MUST (nih_strdup (NULL, orig_xdg_runtime_dir));
+
+	assert0 (setenv ("XDG_RUNTIME_DIR", xdg_runtime_dir, 1));
+
+	/* disable system default job dir */
+	assert0 (setenv ("UPSTART_NO_SYSTEM_USERCONFDIR", "1", 1));
+
+	TEST_DBUS (dbus_pid);
+
+	/************************************************************/
+	TEST_FEATURE ("Session Init without --confdir");
+
+	CREATE_FILE (xdg_conf_dir, "foo.conf", "exec true");
+	CREATE_FILE (xdg_conf_dir, "bar.conf", "exec true");
+	CREATE_FILE (xdg_conf_dir, "baz.conf", "exec true");
+
+	start_upstart_common (&upstart_pid, TRUE, NULL, logdir, NULL);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	session_file = get_session_file (xdg_runtime_dir, upstart_pid);
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	TEST_EQ (lines, 3);
+	TEST_STR_MATCH (output[0], "bar stop/waiting");
+	TEST_STR_MATCH (output[1], "baz stop/waiting");
+	TEST_STR_MATCH (output[2], "foo stop/waiting");
+	nih_free (output);
+
+	DELETE_FILE (xdg_conf_dir, "foo.conf");
+	DELETE_FILE (xdg_conf_dir, "bar.conf");
+	DELETE_FILE (xdg_conf_dir, "baz.conf");
+
+	STOP_UPSTART (upstart_pid);
+	assert0 (unlink (session_file));
+
+	/************************************************************/
+	TEST_FEATURE ("Session Init with --confdir");
+
+	CREATE_FILE (xdg_conf_dir, "xdg_dir_job.conf", "exec true");
+	CREATE_FILE (confdir_a, "conf_dir_job.conf", "exec true");
+
+	start_upstart_common (&upstart_pid, TRUE, confdir_a, logdir, NULL);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	session_file = get_session_file (xdg_runtime_dir, upstart_pid);
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	/* We expect jobs in xdg_conf_dir to be ignored */
+	TEST_EQ (lines, 1);
+	TEST_STR_MATCH (output[0], "conf_dir_job stop/waiting");
+	nih_free (output);
+
+	DELETE_FILE (xdg_conf_dir, "xdg_dir_job.conf");
+	DELETE_FILE (confdir_a, "conf_dir_job.conf");
+
+	STOP_UPSTART (upstart_pid);
+	assert0 (unlink (session_file));
+
+	/************************************************************/
+	TEST_FEATURE ("Session Init with multiple --confdir");
+
+	CREATE_FILE (xdg_conf_dir, "xdg_dir_job.conf", "exec true");
+	CREATE_FILE (confdir_a, "conf_dir_a_job.conf", "exec true");
+	CREATE_FILE (confdir_b, "conf_dir_b_job.conf", "exec true");
+
+	extra[0] = "--confdir";
+	extra[1] = confdir_a;
+	extra[2] = "--confdir";
+	extra[3] = confdir_b;
+	extra[4] = NULL;
+
+	/* pass 2 confdir directories */
+	start_upstart_common (&upstart_pid, TRUE, NULL, logdir, extra);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	session_file = get_session_file (xdg_runtime_dir, upstart_pid);
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	/* We expect jobs in xdg_conf_dir to be ignored */
+	TEST_EQ (lines, 2);
+	TEST_STR_MATCH (output[0], "conf_dir_a_job stop/waiting");
+	TEST_STR_MATCH (output[1], "conf_dir_b_job stop/waiting");
+	nih_free (output);
+
+	DELETE_FILE (xdg_conf_dir, "xdg_dir_job.conf");
+	DELETE_FILE (confdir_a, "conf_dir_a_job.conf");
+	DELETE_FILE (confdir_b, "conf_dir_b_job.conf");
+
+	STOP_UPSTART (upstart_pid);
+	assert0 (unlink (session_file));
+
+	/************************************************************/
+	TEST_FEATURE ("Session Init with multiple --confdir and conflicting names");
+
+	CREATE_FILE (xdg_conf_dir, "conflict.conf", "emits xdg_conf_dir");
+	CREATE_FILE (confdir_a, "conflict.conf", "emits confdir_a");
+	CREATE_FILE (confdir_b, "foo.conf", "exec true");
+
+	extra[0] = "--confdir";
+	extra[1] = confdir_a;
+	extra[2] = "--confdir";
+	extra[3] = confdir_b;
+	extra[4] = NULL;
+
+	/* pass 2 confdir directories */
+	start_upstart_common (&upstart_pid, TRUE, NULL, logdir, extra);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	session_file = get_session_file (xdg_runtime_dir, upstart_pid);
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	/* We expect jobs in xdg_conf_dir to be ignored */
+	TEST_EQ (lines, 2);
+	TEST_STR_MATCH (output[0], "conflict stop/waiting");
+	TEST_STR_MATCH (output[1], "foo stop/waiting");
+	nih_free (output);
+
+	cmd = nih_sprintf (NULL, "%s show-config %s 2>&1", get_initctl (), "conflict");
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	/* Ensure the correct version of the conflict job is found */
+	TEST_EQ (lines, 2);
+	TEST_STR_MATCH (output[0], "conflict");
+	TEST_STR_MATCH (output[1], "  emits confdir_a");
+	nih_free (output);
+
+	DELETE_FILE (xdg_conf_dir, "conflict.conf");
+	DELETE_FILE (confdir_a, "conflict.conf");
+	DELETE_FILE (confdir_b, "foo.conf");
+
+	STOP_UPSTART (upstart_pid);
+	assert0 (unlink (session_file));
+
+	/************************************************************/
+	TEST_FEATURE ("System Init without --confdir");
+
+	/* Use the "secret" interface */
+	assert0 (setenv ("UPSTART_CONFDIR", confdir_a, 1));
+
+	CREATE_FILE (confdir_a, "foo.conf", "exec true");
+	CREATE_FILE (confdir_a, "bar.conf", "exec true");
+	CREATE_FILE (confdir_a, "baz.conf", "exec true");
+
+	/* Disable user mode */
+	test_user_mode = FALSE;
+
+	start_upstart_common (&upstart_pid, FALSE, NULL, logdir, NULL);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	TEST_EQ (lines, 3);
+	TEST_STR_MATCH (output[0], "bar stop/waiting");
+	TEST_STR_MATCH (output[1], "baz stop/waiting");
+	TEST_STR_MATCH (output[2], "foo stop/waiting");
+	nih_free (output);
+
+	DELETE_FILE (confdir_a, "foo.conf");
+	DELETE_FILE (confdir_a, "bar.conf");
+	DELETE_FILE (confdir_a, "baz.conf");
+
+	STOP_UPSTART (upstart_pid);
+
+	/************************************************************/
+	TEST_FEATURE ("System Init with --confdir");
+
+	CREATE_FILE (confdir_a, "foo.conf", "exec true");
+	CREATE_FILE (confdir_a, "bar.conf", "exec true");
+	CREATE_FILE (confdir_b, "baz.conf", "exec true");
+
+	start_upstart_common (&upstart_pid, FALSE, confdir_b, logdir, NULL);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	TEST_EQ (lines, 1);
+	TEST_STR_MATCH (output[0], "baz stop/waiting");
+	nih_free (output);
+
+	DELETE_FILE (confdir_a, "foo.conf");
+	DELETE_FILE (confdir_a, "bar.conf");
+	DELETE_FILE (confdir_b, "baz.conf");
+
+	STOP_UPSTART (upstart_pid);
+
+	/************************************************************/
+	TEST_FEATURE ("System Init with multiple --confdir");
+
+	assert0 (setenv ("UPSTART_CONFDIR", xdg_conf_dir, 1));
+
+	CREATE_FILE (xdg_conf_dir, "foo.conf", "exec true");
+	CREATE_FILE (confdir_a, "bar.conf", "exec true");
+	CREATE_FILE (confdir_b, "baz.conf", "exec true");
+	CREATE_FILE (confdir_b, "qux.conf", "exec true");
+
+	extra[0] = "--confdir";
+	extra[1] = confdir_a;
+	extra[2] = "--confdir";
+	extra[3] = confdir_b;
+	extra[4] = NULL;
+
+	start_upstart_common (&upstart_pid, FALSE, NULL, logdir, extra);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	TEST_EQ (lines, 2);
+	/* XXX: Only the last instance of --confdir should be honoured.
+	 *
+	 * This behaviour deviates from running as a Session Init where *all*
+	 * --confdir's specified are used.
+	 */
+	TEST_STR_MATCH (output[0], "baz stop/waiting");
+	TEST_STR_MATCH (output[1], "qux stop/waiting");
+	nih_free (output);
+
+	DELETE_FILE (xdg_conf_dir, "foo.conf");
+	DELETE_FILE (confdir_a, "bar.conf");
+	DELETE_FILE (confdir_b, "baz.conf");
+	DELETE_FILE (confdir_b, "qux.conf");
+
+	STOP_UPSTART (upstart_pid);
+
+	/************************************************************/
+	TEST_FEATURE ("System Init with multiple --confdir and conflicting names");
+
+	assert0 (setenv ("UPSTART_CONFDIR", xdg_conf_dir, 1));
+
+	CREATE_FILE (xdg_conf_dir, "conflict.conf", "emits xdg_conf_dir");
+	CREATE_FILE (confdir_a, "conflict.conf", "emits confdir_a");
+	CREATE_FILE (confdir_b, "conflict.conf", "emits confdir_b");
+
+	extra[0] = "--confdir";
+	extra[1] = confdir_a;
+	extra[2] = "--confdir";
+	extra[3] = confdir_b;
+	extra[4] = NULL;
+
+	start_upstart_common (&upstart_pid, FALSE, NULL, logdir, extra);
+
+	/* Should be running */
+	assert0 (kill (upstart_pid, 0));
+
+	cmd = nih_sprintf (NULL, "%s list 2>&1", get_initctl ());
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	qsort (output, lines, sizeof (output[0]), strcmp_compar);
+
+	TEST_EQ (lines, 1);
+	/* only the last instance of --confdir should be honoured */
+	TEST_STR_MATCH (output[0], "conflict stop/waiting");
+	nih_free (output);
+
+	cmd = nih_sprintf (NULL, "%s show-config %s 2>&1", get_initctl (), "conflict");
+	TEST_NE_P (cmd, NULL);
+	RUN_COMMAND (NULL, cmd, &output, &lines);
+
+	/* Ensure the correct version of the conflict job is found */
+	TEST_EQ (lines, 2);
+	TEST_STR_MATCH (output[0], "conflict");
+	TEST_STR_MATCH (output[1], "  emits confdir_b");
+	nih_free (output);
+
+	DELETE_FILE (xdg_conf_dir, "conflict.conf");
+	DELETE_FILE (confdir_a, "conflict.conf");
+	DELETE_FILE (confdir_b, "conflict.conf");
+
+	STOP_UPSTART (upstart_pid);
+
+	/************************************************************/
+
+	TEST_DBUS_END (dbus_pid);
+
+	if (orig_xdg_config_home) {
+		/* restore */
+		setenv ("XDG_CONFIG_HOME", orig_xdg_config_home, 1);
+	} else {
+		assert0 (unsetenv ("XDG_CONFIG_HOME"));
+	}
+
+	if (orig_xdg_runtime_dir) {
+		/* restore */
+		setenv ("XDG_RUNTIME_DIR", orig_xdg_runtime_dir, 1);
+	} else {
+		assert0 (unsetenv ("XDG_RUNTIME_DIR"));
+	}
+
+	assert0 (rmdir (confdir_a));
+	assert0 (rmdir (confdir_b));
+	assert0 (rmdir (xdg_conf_dir));
+	assert0 (rmdir (xdg_config_home));
+
+	/* Remove the directory tree the first Session Init created */
+	path = NIH_MUST (nih_sprintf (NULL, "%s/upstart/sessions", xdg_runtime_dir));
+	TEST_EQ (rmdir (path), 0);
+	path = NIH_MUST (nih_sprintf (NULL, "%s/upstart", xdg_runtime_dir));
+	TEST_EQ (rmdir (path), 0);
+	assert0 (rmdir (xdg_runtime_dir));
+
+	assert0 (rmdir (logdir));
+	assert0 (unsetenv ("UPSTART_CONFDIR"));
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+	test_confdir ();
+
+	return 0;
+}

=== removed file 'init/tests/test_util.c'
--- init/tests/test_util.c	2012-11-14 14:47:19 +0000
+++ init/tests/test_util.c	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#include "test_util.h"
-
-/**
- * string_check:
- *
- * @a: first string,
- * @b: second string.
- *
- * Compare @a and @b either or both of which may be NULL.
- *
- * Returns 0 if strings are identical or both NULL, else 1.
- **/
-int
-string_check (const char *a, const char *b)
-{
-	if (!a && !b)
-		return 0;
-
-	if (!a || !b)
-		return 1;
-
-	if (strcmp (a, b))
-		return 1;
-
-	return 0;
-}
-

=== removed file 'init/tests/test_util.h'
--- init/tests/test_util.h	2012-11-07 10:40:40 +0000
+++ init/tests/test_util.h	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-#ifndef TEST_UTIL_H
-#define TEST_UTIL_H
-
-#include <string.h>
-
-/* TEST_ENSURE_CLEAN_ENV:
- *
- * Ensure the environment is as pristine as possible (to avoid follow-on
- * errors caused by not freeing objects in a previous test, say)
- */
-#define TEST_ENSURE_CLEAN_ENV()                                      \
-{                                                                    \
-	setvbuf(stdout, NULL, _IONBF, 0);                            \
-                                                                     \
-	if (job_classes) {                                           \
-		TEST_HASH_EMPTY (job_classes);                       \
-	}                                                            \
-                                                                     \
-	if (conf_sources) {                                          \
-		TEST_LIST_EMPTY (conf_sources);                      \
-	}                                                            \
-                                                                     \
-	if (nih_io_watches) {                                        \
-		TEST_LIST_EMPTY (nih_io_watches);                    \
-	}                                                            \
-                                                                     \
-	if (nih_timers) {                                            \
-		TEST_LIST_EMPTY (nih_timers);                        \
-	}                                                            \
-                                                                     \
-	if (events) {                                                \
-		TEST_LIST_EMPTY (events);                            \
-	}                                                            \
-}
-
-/**
- * _TEST_WATCH_UPDATE:
- * @force: if TRUE, force an update,
- * @timeout: struct timeval pointer, or NULL if no timeout required.
- *
- * Request NIH look for a file event relating to any NihIo objects,
- * with an optional timeout. Behaviour can be forced via @force.
- **/
-#define _TEST_WATCH_UPDATE(force, timeout)                           \
-{                                                                    \
-	int         nfds = 0;                                        \
-	int         ret = 0;                                         \
-	fd_set      readfds, writefds, exceptfds;                    \
-	                                                             \
-	FD_ZERO (&readfds);                                          \
-	FD_ZERO (&writefds);                                         \
-	FD_ZERO (&exceptfds);                                        \
-	                                                             \
-	nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds);  \
-	if (! force) {                                               \
-	  ret = select (nfds, &readfds, &writefds,                   \
-			&exceptfds, timeout);                        \
-	}                                                            \
-	if (force || ret > 0)                                        \
-		nih_io_handle_fds (&readfds, &writefds, &exceptfds); \
-}
-
-/**
- * TEST_WATCH_UPDATE:
- *
- * Request NIH look for a file event relating to any NihIo objects,
- * */
-#define TEST_WATCH_UPDATE()                                          \
-	_TEST_WATCH_UPDATE (0, NULL)
-
-/**
- * TEST_WATCH_UPDATE_TIMEOUT:
- * @timeout: struct timeval pointer.
- *
- * Request NIH look for a file event relating to any NihIo objects
- * within time period @timeout.
- **/
-#define TEST_WATCH_UPDATE_TIMEOUT(timeout)                           \
-	_TEST_WATCH_UPDATE (0, timeout)
-
-/**
- * TEST_WATCH_UPDATE_TIMEOUT_SECS:
- * @secs: seconds to wait before timeout.
- *
- * Request NIH look for a file event relating to any NihIo objects
- * within @secs timeout.
- **/
-#define TEST_WATCH_UPDATE_TIMEOUT_SECS(secs)                         \
-{                                                                    \
-	struct timeval _t;                                           \
-	_t.tv_sec  = secs;                                           \
-	_t.tv_usec = 0;                                              \
-	_TEST_WATCH_UPDATE (0, &_t);                                 \
-}
-
-/**
- * TEST_FORCE_WATCH_UPDATE:
- *
- * Force NIH to look for a file event relating to any NihIo objects.
- **/
-#define TEST_FORCE_WATCH_UPDATE()                                    \
-	_TEST_WATCH_UPDATE (1, NULL)
-
-/**
- * TEST_FORCE_WATCH_UPDATE_TIMEOUT:
- * @timeout: struct timeval pointer.
- *
- * Force NIH to look for a file event relating to any NihIo objects
- * within time period @timeout.
- **/
-#define TEST_FORCE_WATCH_UPDATE_TIMEOUT(timeout)                     \
-	_TEST_WATCH_UPDATE (1, timeout)
-
-/**
- * TEST_FORCE_WATCH_UPDATE_TIMEOUT_SECS:
- * @timeout: struct timeval pointer.
- *
- * Force NIH to look for a file event relating to any NihIo objects
- * within time period @timeout.
- **/
-#define TEST_FORCE_WATCH_UPDATE_TIMEOUT_SECS(secs)                   \
-{                                                                    \
-	struct timeval _t;                                           \
-	_t.tv_sec  = secs;                                           \
-	_t.tv_usec = 0;                                              \
-	_TEST_WATCH_UPDATE (1, &_t);                                 \
-}
-
-/**
- * ENSURE_DIRECTORY_EMPTY:
- * @path: Full path to a directory.
- *
- * Ensure specified directory is empty.
- **/
-#define ENSURE_DIRECTORY_EMPTY(path)                                 \
-{                                                                    \
-	DIR            *dp = NULL;                                   \
-	struct dirent  *file = NULL;                                 \
-	int             count = 0;                                   \
-                                                                     \
-	dp = opendir (path);                                         \
-	TEST_NE_P (dp, NULL);                                        \
-                                                                     \
-	while((file = readdir (dp))) {                               \
-		if (!strcmp (".", file->d_name) ||                   \
-				!strcmp ("..", file->d_name))        \
-			continue;                                    \
-		count++;                                             \
-	}                                                            \
-                                                                     \
-	closedir (dp);                                               \
-                                                                     \
-	TEST_EQ (count, 0);                                          \
-}
-
-/**
- * obj_string_check:
- *
- * @a: first object,
- * @b: second object,
- * @name: name of string element.
- *
- * Compare string element @name in objects @a and @b.
- *
- * Returns: 0 if strings are identical
- * (or both NULL), else 1.
- **/
-#define obj_string_check(a, b, name) \
-	string_check ((a)->name, (b)->name)
-
-/**
- * obj_num_check:
- *
- * @a: first object,
- * @b: second object.
- * @name: name of numeric element.
- *
- * Compare numeric element @name in objects @a and @b.
- *
- * Returns: 0 if @a and @b are identical, else 1.
- **/
-#define obj_num_check(a, b, name) \
-	(a->name != b->name)
-
-/**
- * TEST_CMP_INT_ARRAYS:
- * @a: first array,
- * @b: second array,
- * @sizea: size of @a,
- * @sizeb: size of @b.
- *
- * Compare integer arrays @a and @b for equivalence.
- *
- * Returns: 0 if arrays are identical, else -1.
- **/
-#define TEST_CMP_INT_ARRAYS(a, b, sizea, sizeb) \
-({int ret = 0; \
- size_t __i; \
- if (sizea == sizeb) { \
-	 for (__i = 0; \
-		 __i < sizea; \
-		 __i++) { \
-	 	if ((a)[__i] != (b)[__i]) { \
- 			ret = -1; \
- 			break; \
- 		} \
- 	} \
- } else \
- 	ret = -1; \
- ret;})
-
-/**
- * TEST_CMP_STR_ARRAYS:
- * @a: first string array,
- * @b: second string array,
- * @sizea: length of @a, 
- * @sizeb: length of @b.
- *
- * Compare string arrays @a and @b for equivalence.
- *
- * Returns: 0 if arrays are identical, else -1.
- **/
-#define TEST_CMP_STR_ARRAYS(a, b, sizea, sizeb) \
-({ int ret = 0; \
- if (sizea == sizeb) { \
-	 for (size_t __i = 0; \
-		 __i < sizea; \
-		 __i++) { \
-	 	if (strcmp (a[__i], b[__i])) { \
- 			ret = -1; \
- 			break; \
- 		} \
- 	} \
- } else \
- 	ret = -1; \
- ret;})
-
-/**
- * TEST_TWO_LISTS_FOREACH:
- * @list1: entry in the first list to iterate,
- * @list2: entry in the second list to iterate,
- * @iter1: name of iterator variable for @list1,
- * @iter2: name of iterator variable for @list2.
- *
- * Dual version of NIH_LIST_FOREACH() which iterates 
- * two lists in tandem.
- **/
-#define TEST_TWO_LISTS_FOREACH(list1, list2, iter1, iter2) \
-	for (NihList *iter1 = (list1)->next, \
-		     *iter2 = (list2)->next; \
-		iter1 != (list1) && iter2 != (list2); \
-		iter1 = iter1->next, \
-		iter2 = iter2->next)
-
-/**
- * TEST_TWO_HASHES_FOREACH:
- * @hash1: entry in the first hash to iterate,
- * @hash2: entry in the second hash to iterate,
- * @iter1: name of iterator variable for @hash1,
- * @iter2: name of iterator variable for @hash2.
- *
- * Dual version of NIH_HASH_FOREACH() which iterates
- * two hashes in tandem.
- **/
-#define TEST_TWO_HASHES_FOREACH(hash1, hash2, iter1, iter2) \
-	for (size_t _##iter##_i = 0; _##iter##_i < (hash1)->size; \
-	     _##iter##_i++) \
-		TEST_TWO_LISTS_FOREACH (&(hash1)->bins[_##iter##_i], \
-					&(hash2)->bins[_##iter##_i], \
-				iter1, iter2)
-
-/**
- * TEST_TWO_TREES_FOREACH:
- * @tree1: root of the first tree to iterate,
- * @tree2: root of the second tree to iterate,
- * @iter1: name of iterator variable for @tree1,
- * @iter2: name of iterator variable for @tree2.
- *
- * Dual version of NIH_TREE_FOREACH() which walks
- * two trees in tandem.
- **/
-#define TEST_TWO_TREES_FOREACH(tree1, tree2, iter1, iter2) \
-	for (NihTree *iter1 = nih_tree_next (tree1, NULL), \
-			*iter2 = nih_tree_next (tree2, NULL); \
-			iter1 != NULL && iter2 != NULL; \
-			iter1 = nih_tree_next (tree1, iter1), \
-			iter2 = nih_tree_next (tree2, iter2))
-
-
-/**
- * TEST_ARRAY_SIZE:
- * @array: array.
- * 
- * Determine size of specified array.
- *
- * Returns: array size.
- **/
-#define TEST_ARRAY_SIZE(array) \
-	(sizeof (array) / sizeof (array[0]))
-
-/* Prototypes */
-extern int string_check (const char *a, const char *b);
-
-#endif /* TEST_UTIL_H */

=== modified file 'init/xdg.c'
--- init/xdg.c	2013-01-30 16:39:11 +0000
+++ init/xdg.c	2013-05-30 13:17:28 +0000
@@ -319,8 +319,10 @@
 	dirs = NULL;
 
 	/* System's read-only location */
-	if (! nih_str_array_add (&all_dirs, NULL, NULL, SYSTEM_USERCONFDIR))
-		goto error;
+	if (! getenv ("UPSTART_NO_SYSTEM_USERCONFDIR")) {
+		if (! nih_str_array_add (&all_dirs, NULL, NULL, SYSTEM_USERCONFDIR))
+			goto error;
+	}
 
 	return all_dirs;
 	

=== added directory 'test'
=== added file 'test/Makefile.am'
--- test/Makefile.am	1970-01-01 00:00:00 +0000
+++ test/Makefile.am	2013-05-30 13:17:28 +0000
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+INITCTL_BINARY = $(abs_top_builddir)/util/initctl
+UPSTART_BINARY = $(abs_top_builddir)/init/init
+
+AM_CFLAGS = \
+	$(NIH_CFLAGS) \
+	$(NIH_DBUS_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+AM_CPPFLAGS = \
+	-DLOCALEDIR="\"$(localedir)\"" \
+	-DINITCTL_BUILD \
+	-DSBINDIR="\"$(sbindir)\"" \
+	-DUPSTART_BINARY="\"$(UPSTART_BINARY)\"" \
+	-DINITCTL_BINARY="\"$(INITCTL_BINARY)\"" \
+	-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
+	-I$(top_srcdir)/intl
+
+check_LIBRARIES = libtest_util.a
+libtest_util_a_SOURCES = test_util.c test_util.h

=== added file 'test/test_util.c'
--- test/test_util.c	1970-01-01 00:00:00 +0000
+++ test/test_util.c	2013-05-30 13:17:28 +0000
@@ -0,0 +1,628 @@
+/* upstart
+ *
+ * test_util.c - test utilities
+ * associated serialisation and deserialisation routines.
+ *
+ * Copyright © 2012 Canonical Ltd.
+ * Author: James Hunt <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <nih/test.h>
+#include <nih/file.h>
+#include <nih/string.h>
+#include <nih/signal.h>
+#include <nih/logging.h>
+#include <nih-dbus/test_dbus.h>
+
+#include <dbus/dbus.h>
+
+#include <stdio.h>
+#include <signal.h>
+#include <unistd.h>
+#include <regex.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+
+#include <nih-dbus/dbus_error.h>
+#include <nih-dbus/dbus_connection.h>
+#include <nih-dbus/dbus_proxy.h>
+#include <nih-dbus/errors.h>  
+
+#include "dbus/upstart.h"
+
+#include "test_util.h"
+
+#ifndef UPSTART_BINARY
+#error unable to find init binary as UPSTART_BINARY not defined
+#endif /* UPSTART_BINARY */
+
+#ifndef INITCTL_BINARY
+#error unable to find initctl binary as INITCTL_BINARY not defined
+#endif /* INITCTL_BINARY */
+
+static void selfpipe_write (int n);
+static void selfpipe_setup (void);
+
+/**
+ * wait_for_upstart:
+ *
+ * @user: TRUE if waiting for a Session Init (which uses a private bus
+ * rather than the session bus), else FALSE.
+ *
+ * Wait for Upstart to appear on D-Bus denoting its completion of
+ * initialisation. Wait time is somewhat arbitrary (but more
+ * than adequate!).
+ **/
+void
+wait_for_upstart (int user)
+{
+	nih_local NihDBusProxy *upstart = NULL;
+	DBusConnection         *connection;
+	char                   *address;
+	NihError               *err;
+	int                     running = FALSE;
+
+	/* XXX: arbitrary value */
+	int                     attempts = 10;
+
+	if (user) {
+		TEST_TRUE (set_upstart_session ());
+		address = getenv ("UPSTART_SESSION");
+	} else {
+		address = getenv ("DBUS_SESSION_BUS_ADDRESS");
+	}
+
+	TEST_TRUE (address);
+
+	while (attempts) {
+		attempts--;
+		sleep (1);
+		connection = nih_dbus_connect (address, NULL);
+
+		if (! connection) {
+			err = nih_error_get ();
+			nih_free (err);
+			continue;
+		}
+
+		upstart = nih_dbus_proxy_new (NULL, connection,
+				      	      NULL,
+					      DBUS_PATH_UPSTART,
+				      	      NULL, NULL);
+
+		if (! upstart) {
+			err = nih_error_get ();
+			nih_free (err);
+			dbus_connection_unref (connection);
+		} else {
+			running = TRUE;
+			break;
+		}
+	}
+	TEST_EQ (running, TRUE);
+}
+
+/* TRUE to denote that Upstart is running in user session mode
+ * (FALSE to denote it's using the users D-Bus session bus).
+ */
+int test_user_mode = FALSE;
+
+/**
+ * set_upstart_session:
+ *
+ * Attempt to "enter" an Upstart session by setting UPSTART_SESSION to
+ * the value of the currently running session.
+ *
+ * It is only legitimate to call this function if you have previously
+ * started a Session Init process.
+ *
+ * Limitations: Assumes that at most 1 session is running.
+ *
+ * Returns: TRUE if it was possible to enter the currently running
+ * Upstart session, else FALSE.
+ **/
+int
+set_upstart_session (void)
+{
+	char                     *value;
+	nih_local char           *cmd = NULL;
+	nih_local char          **output = NULL;
+	size_t                    lines = 0;
+	int                       got = FALSE;
+	int                       i;
+
+	/* XXX: arbitrary value */
+	int                       loops = 5;
+
+	/* list-sessions relies on this */
+	if (! getenv ("XDG_RUNTIME_DIR"))
+		return FALSE;
+
+	cmd = nih_sprintf (NULL, "%s list-sessions 2>&1", INITCTL_BINARY);
+	TEST_NE_P (cmd, NULL);
+
+	/* We expect the list-sessions command to return a valid session
+	 * within a reasonable period of time.
+	 */
+	for (i = 0; i < loops; i++) {
+		sleep (1);
+
+		RUN_COMMAND (NULL, cmd, &output, &lines);
+		if (lines != 1)
+			continue;
+
+		/* No pid in output */
+		if (! isdigit(output[0][0]))
+			continue;
+
+		/* look for separator between pid and value of
+		 * UPSTART_SESSION.
+		 */
+		value = strstr (output[0], " ");
+		if (! value)
+			continue;
+
+		/* jump over space */
+		value  += 1;
+		if (! value)
+			continue;
+
+		/* No socket address */
+		if (strstr (value, "unix:abstract") == value) {
+			got = TRUE;
+			break;
+		}
+	}
+
+	if (got != TRUE)
+		return FALSE;
+
+	assert0 (setenv ("UPSTART_SESSION", value, 1));
+
+	return TRUE;
+}
+
+/**
+ * selfpipe:
+ *
+ * Used to allow a timed process wait.
+ **/
+static int selfpipe[2] = { -1, -1 };
+
+static void
+selfpipe_write (int n)
+{
+    assert (selfpipe[1] != -1);
+
+    TEST_EQ (write (selfpipe[1], "", 1), 1);
+}
+
+/**
+ * selfpipe_setup:
+ *
+ * Arrange for SIGCHLD to write to selfpipe such that we can select(2)
+ * on child process status changes.
+ **/
+static void
+selfpipe_setup (void)
+{
+    static struct sigaction  act;
+    int                      read_flags;
+    int                      write_flags;
+
+    assert (selfpipe[0] == -1);
+
+    assert (! pipe (selfpipe));
+
+    /* Set non-blocking */
+    read_flags = fcntl (selfpipe[0], F_GETFL);
+    write_flags = fcntl (selfpipe[1], F_GETFL);
+
+    read_flags |= O_NONBLOCK;
+    write_flags |= O_NONBLOCK;
+
+    assert (fcntl (selfpipe[0], F_SETFL, read_flags) == 0);
+    assert (fcntl (selfpipe[1], F_SETFL, write_flags) == 0);
+
+    /* Don't leak */
+    assert (fcntl (selfpipe[0], F_SETFD, FD_CLOEXEC) == 0);
+    assert (fcntl (selfpipe[1], F_SETFD, FD_CLOEXEC) == 0);
+
+    memset (&act, 0, sizeof (act));
+
+    /* register SIGCHLD handler which will cause pipe write when child
+     * changes state.
+     */
+    act.sa_handler = selfpipe_write;
+
+    sigaction (SIGCHLD, &act, NULL);
+}
+
+/**
+ * timed_waitpid:
+ *
+ * @pid: pid to wait for,
+ * @timeout: seconds to wait for @pid to change state.
+ *
+ * Simplified waitpid(2) with timeout using a pipe to allow select(2)
+ * with timeout to be used to wait for process state change.
+ **/
+pid_t
+timed_waitpid (pid_t pid, time_t timeout)
+{
+    static char     buffer[1];
+    fd_set          read_fds;
+    struct timeval  tv;
+    int             status;
+    int             nfds;
+    int             ret;
+    pid_t           ret2;
+
+    assert (pid);
+    assert (timeout);
+
+    if (selfpipe[0] == -1)
+	    selfpipe_setup ();
+
+    FD_ZERO (&read_fds);
+    FD_SET (selfpipe[0], &read_fds);
+
+    nfds = 1 + selfpipe[0];
+
+    tv.tv_sec   = timeout;
+    tv.tv_usec  = 0;
+
+    /* wait for some activity */
+    ret = select (nfds, &read_fds, NULL, NULL, &tv);
+
+    if (! ret)
+	    /* timed out */
+	    return 0;
+
+    /* discard any data written to pipe */
+    while (read (selfpipe[0], buffer, sizeof (buffer)) > 0)
+	    ;
+
+    while (TRUE) {
+	    /* wait for status change or error */
+	    ret2 = waitpid (pid, &status, WNOHANG);
+
+	    if (ret2 < 0)
+		    return -1;
+
+	    if (! ret2)
+		    /* give child a chance to change state */
+		    sleep (1);
+
+	    if (ret2) {
+		    if (WIFEXITED (status))
+			    return ret2;
+
+		    /* unexpected status change */
+		    return -1;
+	    }
+    }
+}
+
+
+/**
+ * get_initctl():
+ *
+ * Determine a suitable initctl command-line for testing purposes.
+ *
+ * Returns: Static string representing full path to initctl binary with
+ * default option to allow communication with an Upstart started using
+ * START_UPSTART().
+ **/
+char *
+get_initctl (void)
+{
+	static char path[PATH_MAX + 1024] = { 0 };
+	int         ret;
+
+	ret = sprintf (path, "%s %s",
+			INITCTL_BINARY,
+			test_user_mode
+			? "--user"
+			: "--session");
+
+	assert (ret > 0);
+
+	return path;
+}
+
+/*
+ * _start_upstart:
+ *
+ * @pid: PID of running instance,
+ * @user: TRUE if upstart will run in User Session mode (FALSE to
+ *  use the users D-Bus session bus),
+ * @args: optional list of arguments to specify.
+ *
+ * Start an instance of Upstart.
+ *
+ * If the instance fails to start, abort(3) is called.
+ **/
+void
+_start_upstart (pid_t *pid, int user, char * const *args)
+{
+	nih_local char  **argv = NULL;
+	sigset_t          child_set, orig_set;
+
+	assert (pid);
+
+	argv = NIH_MUST (nih_str_array_new (NULL));
+
+	NIH_MUST (nih_str_array_add (&argv, NULL, NULL,
+				UPSTART_BINARY));
+
+	if (args)
+		NIH_MUST (nih_str_array_append (&argv, NULL, NULL, args));
+
+	sigfillset (&child_set);
+	sigprocmask (SIG_BLOCK, &child_set, &orig_set);
+
+	TEST_NE (*pid = fork (), -1);
+
+	if (! *pid) {
+		int fd;
+		nih_signal_reset ();
+		sigprocmask (SIG_SETMASK, &orig_set, NULL);
+
+		if (! getenv ("UPSTART_TEST_VERBOSE")) {
+			fd = open ("/dev/null", O_RDWR);
+			assert (fd >= 0);
+			assert (dup2 (fd, STDIN_FILENO) != -1);
+			assert (dup2 (fd, STDOUT_FILENO) != -1);
+			assert (dup2 (fd, STDERR_FILENO) != -1);
+		}
+
+		assert (execv (argv[0], argv) != -1);
+	}
+
+	sigprocmask (SIG_SETMASK, &orig_set, NULL);
+	wait_for_upstart (user);
+}
+
+/**
+ * start_upstart_common:
+ *
+ * @pid: PID of running instance,
+ * @user: TRUE if upstart should run in User Session mode (FALSE to
+ * use the users D-Bus session bus),
+ * @confdir: full path to configuration directory,
+ * @logdir: full path to log directory,
+ * @extra: optional extra arguments.
+ *
+ * Wrapper round _start_upstart() which specifies common options.
+ **/
+void
+start_upstart_common (pid_t *pid, int user, const char *confdir,
+		      const char *logdir, char * const *extra)
+{
+	nih_local char  **args = NULL;
+
+	assert (pid);
+
+	args = NIH_MUST (nih_str_array_new (NULL));
+
+	if (user) {
+		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+					"--user"));
+		test_user_mode = TRUE;
+	} else {
+		TEST_TRUE (getenv ("DBUS_SESSION_BUS_ADDRESS"));
+		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+					"--session"));
+	}
+
+	NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+				"--no-startup-event"));
+
+	NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+				"--no-sessions"));
+
+	NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+				"--no-inherit-env"));
+
+	if (confdir) {
+		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+					"--confdir"));
+		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+					confdir));
+	}
+
+	if (logdir) {
+		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+					"--logdir"));
+		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
+					logdir));
+	}
+
+	if (extra)
+		NIH_MUST (nih_str_array_append (&args, NULL, NULL, extra));
+
+	_start_upstart (pid, user, args);
+}
+
+/**
+ * start_upstart:
+ *
+ * @pid: PID of running instance.
+ *
+ * Wrapper round _start_upstart() which just runs an instance with no
+ * options.
+ **/
+void
+start_upstart (pid_t *pid)
+{
+	start_upstart_common (pid, FALSE, NULL, NULL, NULL);
+}
+
+/**
+ * job_to_pid:
+ *
+ * @job: job name.
+ *
+ * Determine pid of running job.
+ *
+ * WARNING: it is the callers responsibility to ensure that
+ * @job is still running when this function is called!!
+ *
+ * Returns: pid of job, or -1 if not found.
+ **/
+pid_t
+job_to_pid (const char *job)
+{
+	pid_t            pid;
+	regex_t          regex;
+	regmatch_t       regmatch[2];
+	int              ret;
+	nih_local char  *cmd = NULL;
+	nih_local char  *pattern = NULL;
+	size_t           lines;
+	char           **status;
+	nih_local char  *str_pid = NULL;
+
+	assert (job);
+
+	pattern = NIH_MUST (nih_sprintf
+			(NULL, "^\\b%s\\b .*, process ([0-9]+)", job));
+
+	cmd = NIH_MUST (nih_sprintf (NULL, "%s status %s 2>&1",
+			get_initctl (), job));
+	RUN_COMMAND (NULL, cmd, &status, &lines);
+	TEST_EQ (lines, 1);
+
+	ret = regcomp (&regex, pattern, REG_EXTENDED);
+	assert0 (ret);
+
+	ret = regexec (&regex, status[0], 2, regmatch, 0);
+	if (ret == REG_NOMATCH) {
+		ret = -1;
+		goto out;
+	}
+	assert0 (ret);
+
+	if (regmatch[1].rm_so == -1 || regmatch[1].rm_eo == -1) {
+		ret = -1;
+		goto out;
+	}
+
+	/* extract the pid */
+	NIH_MUST (nih_strncat (&str_pid, NULL,
+			&status[0][regmatch[1].rm_so],
+			regmatch[1].rm_eo - regmatch[1].rm_so));
+
+	nih_free (status);
+
+	pid = (pid_t)atol (str_pid);
+
+	/* check it's running */
+	ret = kill (pid, 0);
+	if (! ret)
+		ret = pid;
+
+out:
+	regfree (&regex);
+	return ret;
+}
+
+const char *
+get_upstart_binary (void)
+{
+	return UPSTART_BINARY;
+}
+
+const char *
+get_initctl_binary (void)
+{
+	return INITCTL_BINARY;
+}
+
+/**
+ * string_check:
+ *
+ * @a: first string,
+ * @b: second string.
+ *
+ * Compare @a and @b either or both of which may be NULL.
+ *
+ * Returns 0 if strings are identical or both NULL, else 1.
+ **/
+int
+string_check (const char *a, const char *b)
+{
+	if (!a && !b)
+		return 0;
+
+	if (!a || !b)
+		return 1;
+
+	if (strcmp (a, b))
+		return 1;
+
+	return 0;
+}
+
+/**
+ * strcmp_compar:
+ *
+ * @a: first string,
+ * @b: second string.
+ *
+ * String comparison function suitable for passing to qsort(3).
+ * See the qsort(3) man page for further details.
+ **/
+int
+strcmp_compar (const void *a, const void *b)
+{
+	return strcmp(*(char * const *)a, *(char * const *)b);
+}
+
+/**
+ * get_session_file:
+ *
+ * @xdg_runtime_dir: Directory to treat as XDG_RUNTIME_DIR,
+ * @pid: pid of running Session Init instance.
+ *
+ * Determine full path to a Session Inits session file.
+ *
+ * Note: No check on the existence of the session file is performed.
+ *
+ * Returns: Newly-allocated string representing full path to Session
+ *          Inits session file.
+ **/
+char *
+get_session_file (const char *xdg_runtime_dir, pid_t pid)
+{
+	char *session_file;
+	
+	nih_assert (xdg_runtime_dir);
+	nih_assert (pid);
+
+	session_file = nih_sprintf (NULL, "%s/upstart/sessions/%d.session",
+			xdg_runtime_dir, (int)pid);
+
+	nih_assert (session_file);
+
+	return session_file;
+}

=== added file 'test/test_util.h'
--- test/test_util.h	1970-01-01 00:00:00 +0000
+++ test/test_util.h	2013-05-30 13:17:28 +0000
@@ -0,0 +1,725 @@
+#ifndef TEST_UTIL_H
+#define TEST_UTIL_H
+
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <nih-dbus/test_dbus.h>
+
+#define BUFFER_SIZE 1024
+
+/**
+ * TEST_QUIESCE_WAIT_PHASE:
+ *
+ * Maximum time we expect upstart to wait in the QUIESCE_PHASE_WAIT
+ * phase.
+ **/
+#define TEST_EXIT_TIME 5
+
+/**
+ * TEST_QUIESCE_KILL_PHASE:
+ *
+ * Maximum time we expect upstart to wait in the QUIESCE_PHASE_KILL
+ * phase.
+ **/
+#define TEST_QUIESCE_KILL_PHASE 5
+
+#define TEST_QUIESCE_TOTAL_WAIT_TIME (TEST_EXIT_TIME + TEST_QUIESCE_KILL_PHASE)
+
+/* A 'reasonable' path, but which also contains a marker at the end so
+ * we know when we're looking at a PATH these tests have set.
+ */
+#define TEST_INITCTL_DEFAULT_PATH "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/wibble"
+
+/* Default value for TERM if not already set */
+#define TEST_INITCTL_DEFAULT_TERM "linux"
+
+
+/* TEST_ENSURE_CLEAN_ENV:
+ *
+ * Ensure the environment is as pristine as possible (to avoid follow-on
+ * errors caused by not freeing objects in a previous test, say)
+ */
+#define TEST_ENSURE_CLEAN_ENV()                                      \
+{                                                                    \
+	setvbuf(stdout, NULL, _IONBF, 0);                            \
+                                                                     \
+	if (job_classes) {                                           \
+		TEST_HASH_EMPTY (job_classes);                       \
+	}                                                            \
+                                                                     \
+	if (conf_sources) {                                          \
+		TEST_LIST_EMPTY (conf_sources);                      \
+	}                                                            \
+                                                                     \
+	if (nih_io_watches) {                                        \
+		TEST_LIST_EMPTY (nih_io_watches);                    \
+	}                                                            \
+                                                                     \
+	if (nih_timers) {                                            \
+		TEST_LIST_EMPTY (nih_timers);                        \
+	}                                                            \
+                                                                     \
+	if (events) {                                                \
+		TEST_LIST_EMPTY (events);                            \
+	}                                                            \
+}
+
+/**
+ * _TEST_WATCH_UPDATE:
+ * @force: if TRUE, force an update,
+ * @timeout: struct timeval pointer, or NULL if no timeout required.
+ *
+ * Request NIH look for a file event relating to any NihIo objects,
+ * with an optional timeout. Behaviour can be forced via @force.
+ **/
+#define _TEST_WATCH_UPDATE(force, timeout)                           \
+{                                                                    \
+	int         nfds = 0;                                        \
+	int         ret = 0;                                         \
+	fd_set      readfds, writefds, exceptfds;                    \
+	                                                             \
+	FD_ZERO (&readfds);                                          \
+	FD_ZERO (&writefds);                                         \
+	FD_ZERO (&exceptfds);                                        \
+	                                                             \
+	nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds);  \
+	if (! force) {                                               \
+	  ret = select (nfds, &readfds, &writefds,                   \
+			&exceptfds, timeout);                        \
+	}                                                            \
+	if (force || ret > 0)                                        \
+		nih_io_handle_fds (&readfds, &writefds, &exceptfds); \
+}
+
+/**
+ * TEST_WATCH_UPDATE:
+ *
+ * Request NIH look for a file event relating to any NihIo objects,
+ * */
+#define TEST_WATCH_UPDATE()                                          \
+	_TEST_WATCH_UPDATE (0, NULL)
+
+/**
+ * TEST_WATCH_UPDATE_TIMEOUT:
+ * @timeout: struct timeval pointer.
+ *
+ * Request NIH look for a file event relating to any NihIo objects
+ * within time period @timeout.
+ **/
+#define TEST_WATCH_UPDATE_TIMEOUT(timeout)                           \
+	_TEST_WATCH_UPDATE (0, timeout)
+
+/**
+ * TEST_WATCH_UPDATE_TIMEOUT_SECS:
+ * @secs: seconds to wait before timeout.
+ *
+ * Request NIH look for a file event relating to any NihIo objects
+ * within @secs timeout.
+ **/
+#define TEST_WATCH_UPDATE_TIMEOUT_SECS(secs)                         \
+{                                                                    \
+	struct timeval _t;                                           \
+	_t.tv_sec  = secs;                                           \
+	_t.tv_usec = 0;                                              \
+	_TEST_WATCH_UPDATE (0, &_t);                                 \
+}
+
+/**
+ * TEST_FORCE_WATCH_UPDATE:
+ *
+ * Force NIH to look for a file event relating to any NihIo objects.
+ **/
+#define TEST_FORCE_WATCH_UPDATE()                                    \
+	_TEST_WATCH_UPDATE (1, NULL)
+
+/**
+ * TEST_FORCE_WATCH_UPDATE_TIMEOUT:
+ * @timeout: struct timeval pointer.
+ *
+ * Force NIH to look for a file event relating to any NihIo objects
+ * within time period @timeout.
+ **/
+#define TEST_FORCE_WATCH_UPDATE_TIMEOUT(timeout)                     \
+	_TEST_WATCH_UPDATE (1, timeout)
+
+/**
+ * TEST_FORCE_WATCH_UPDATE_TIMEOUT_SECS:
+ * @timeout: struct timeval pointer.
+ *
+ * Force NIH to look for a file event relating to any NihIo objects
+ * within time period @timeout.
+ **/
+#define TEST_FORCE_WATCH_UPDATE_TIMEOUT_SECS(secs)                   \
+{                                                                    \
+	struct timeval _t;                                           \
+	_t.tv_sec  = secs;                                           \
+	_t.tv_usec = 0;                                              \
+	_TEST_WATCH_UPDATE (1, &_t);                                 \
+}
+
+/**
+ * ENSURE_DIRECTORY_EMPTY:
+ * @path: Full path to a directory.
+ *
+ * Ensure specified directory is empty.
+ **/
+#define ENSURE_DIRECTORY_EMPTY(path)                                 \
+{                                                                    \
+	DIR            *dp = NULL;                                   \
+	struct dirent  *file = NULL;                                 \
+	int             count = 0;                                   \
+                                                                     \
+	dp = opendir (path);                                         \
+	TEST_NE_P (dp, NULL);                                        \
+                                                                     \
+	while((file = readdir (dp))) {                               \
+		if (!strcmp (".", file->d_name) ||                   \
+				!strcmp ("..", file->d_name))        \
+			continue;                                    \
+		count++;                                             \
+	}                                                            \
+                                                                     \
+	closedir (dp);                                               \
+                                                                     \
+	TEST_EQ (count, 0);                                          \
+}
+
+/**
+ * obj_string_check:
+ *
+ * @a: first object,
+ * @b: second object,
+ * @name: name of string element.
+ *
+ * Compare string element @name in objects @a and @b.
+ *
+ * Returns: 0 if strings are identical
+ * (or both NULL), else 1.
+ **/
+#define obj_string_check(a, b, name) \
+	string_check ((a)->name, (b)->name)
+
+/**
+ * obj_num_check:
+ *
+ * @a: first object,
+ * @b: second object.
+ * @name: name of numeric element.
+ *
+ * Compare numeric element @name in objects @a and @b.
+ *
+ * Returns: 0 if @a and @b are identical, else 1.
+ **/
+#define obj_num_check(a, b, name) \
+	(a->name != b->name)
+
+/**
+ * TEST_CMP_INT_ARRAYS:
+ * @a: first array,
+ * @b: second array,
+ * @sizea: size of @a,
+ * @sizeb: size of @b.
+ *
+ * Compare integer arrays @a and @b for equivalence.
+ *
+ * Returns: 0 if arrays are identical, else -1.
+ **/
+#define TEST_CMP_INT_ARRAYS(a, b, sizea, sizeb) \
+({int ret = 0; \
+ size_t __i; \
+ if (sizea == sizeb) { \
+	 for (__i = 0; \
+		 __i < sizea; \
+		 __i++) { \
+	 	if ((a)[__i] != (b)[__i]) { \
+ 			ret = -1; \
+ 			break; \
+ 		} \
+ 	} \
+ } else \
+ 	ret = -1; \
+ ret;})
+
+/**
+ * TEST_CMP_STR_ARRAYS:
+ * @a: first string array,
+ * @b: second string array,
+ * @sizea: length of @a, 
+ * @sizeb: length of @b.
+ *
+ * Compare string arrays @a and @b for equivalence.
+ *
+ * Returns: 0 if arrays are identical, else -1.
+ **/
+#define TEST_CMP_STR_ARRAYS(a, b, sizea, sizeb) \
+({ int ret = 0; \
+ if (sizea == sizeb) { \
+	 for (size_t __i = 0; \
+		 __i < sizea; \
+		 __i++) { \
+	 	if (strcmp (a[__i], b[__i])) { \
+ 			ret = -1; \
+ 			break; \
+ 		} \
+ 	} \
+ } else \
+ 	ret = -1; \
+ ret;})
+
+/**
+ * TEST_TWO_LISTS_FOREACH:
+ * @list1: entry in the first list to iterate,
+ * @list2: entry in the second list to iterate,
+ * @iter1: name of iterator variable for @list1,
+ * @iter2: name of iterator variable for @list2.
+ *
+ * Dual version of NIH_LIST_FOREACH() which iterates 
+ * two lists in tandem.
+ **/
+#define TEST_TWO_LISTS_FOREACH(list1, list2, iter1, iter2) \
+	for (NihList *iter1 = (list1)->next, \
+		     *iter2 = (list2)->next; \
+		iter1 != (list1) && iter2 != (list2); \
+		iter1 = iter1->next, \
+		iter2 = iter2->next)
+
+/**
+ * TEST_TWO_HASHES_FOREACH:
+ * @hash1: entry in the first hash to iterate,
+ * @hash2: entry in the second hash to iterate,
+ * @iter1: name of iterator variable for @hash1,
+ * @iter2: name of iterator variable for @hash2.
+ *
+ * Dual version of NIH_HASH_FOREACH() which iterates
+ * two hashes in tandem.
+ **/
+#define TEST_TWO_HASHES_FOREACH(hash1, hash2, iter1, iter2) \
+	for (size_t _##iter##_i = 0; _##iter##_i < (hash1)->size; \
+	     _##iter##_i++) \
+		TEST_TWO_LISTS_FOREACH (&(hash1)->bins[_##iter##_i], \
+					&(hash2)->bins[_##iter##_i], \
+				iter1, iter2)
+
+/**
+ * TEST_TWO_TREES_FOREACH:
+ * @tree1: root of the first tree to iterate,
+ * @tree2: root of the second tree to iterate,
+ * @iter1: name of iterator variable for @tree1,
+ * @iter2: name of iterator variable for @tree2.
+ *
+ * Dual version of NIH_TREE_FOREACH() which walks
+ * two trees in tandem.
+ **/
+#define TEST_TWO_TREES_FOREACH(tree1, tree2, iter1, iter2) \
+	for (NihTree *iter1 = nih_tree_next (tree1, NULL), \
+			*iter2 = nih_tree_next (tree2, NULL); \
+			iter1 != NULL && iter2 != NULL; \
+			iter1 = nih_tree_next (tree1, iter1), \
+			iter2 = nih_tree_next (tree2, iter2))
+
+
+/**
+ * TEST_ARRAY_SIZE:
+ * @array: array.
+ * 
+ * Determine size of specified array.
+ *
+ * Returns: array size.
+ **/
+#define TEST_ARRAY_SIZE(array) \
+	(sizeof (array) / sizeof (array[0]))
+
+/**
+ * START_UPSTART:
+ *
+ * @pid: pid_t that will contain pid of running instance on success,
+ * @user_mode: TRUE for Session Init (or FALSE to use D-Bus
+ * session bus).
+ *
+ * Start an instance of Upstart and return PID in @pid.
+ **/
+#define START_UPSTART(pid, user_mode)                                \
+	start_upstart_common (&(pid), user_mode, NULL, NULL, NULL)
+
+/**
+ * KILL_UPSTART:
+ *
+ * @pid: pid of upstart to kill,
+ * @signo: signal number to send to @pid,
+ * @wait: TRUE to wait for @pid to die.
+ *
+ * Send specified signal to upstart process @pid.
+ **/
+#define KILL_UPSTART(pid, signo, wait)                               \
+{                                                                    \
+	int status;                                                  \
+	assert (pid);                                                \
+	assert (signo);                                              \
+	                                                             \
+	assert0 (kill (pid, signo));                                 \
+	if (wait) {                                                  \
+		TEST_EQ (waitpid (pid, &status, 0), pid);            \
+		TEST_TRUE (WIFSIGNALED (status));                    \
+		TEST_TRUE (WTERMSIG (status) == signo);              \
+	}                                                            \
+	/* reset since a subsequent start could specify a different  \
+	 * user_mode value.                                          \
+	 */                                                          \
+	test_user_mode = FALSE;                                      \
+}
+
+/**
+ * STOP_UPSTART:
+ *
+ * @pid: pid of upstart to kill.
+ *
+ * Stop upstart process @pid.
+ **/
+#define STOP_UPSTART(pid)                                            \
+	KILL_UPSTART (pid, SIGKILL, TRUE)
+
+/**
+ * REEXEC_UPSTART:
+ *
+ * @pid: pid of upstart.
+ *
+ * Force upstart to perform a re-exec.
+ **/
+#define REEXEC_UPSTART(pid)                                          \
+	KILL_UPSTART (pid, SIGTERM, FALSE);                          \
+	wait_for_upstart (FALSE)
+
+/**
+ * RUN_COMMAND:
+ *
+ * @parent: pointer to parent object,
+ * @cmd: string representing command to run,
+ * @result: "char ***" pointer which will contain an array of string
+ * values corresponding to lines of standard output generated by @cmd,
+ * @len: size_t pointer which will be set to length of @result.
+ *
+ * Run a command and return its standard output. It is the callers
+ * responsibility to free @result. Errors from running @cmd are fatal.
+ *
+ * Note: trailing '\n' characters are removed in returned command
+ * output.
+ **/
+#define RUN_COMMAND(parent, cmd, result, len)                        \
+{                                                                    \
+	FILE    *f;                                                  \
+	char     buffer[BUFFER_SIZE];                                \
+	char   **ret;                                                \
+	                                                             \
+	assert (cmd[0]);                                             \
+	                                                             \
+	*(result) = nih_str_array_new (parent);                      \
+	TEST_NE_P (*result, NULL);                                   \
+	*(len) = 0;                                                  \
+	                                                             \
+	f = popen (cmd, "r");                                        \
+	TEST_NE_P (f, NULL);                                         \
+	                                                             \
+	while (fgets (buffer, BUFFER_SIZE, f)) {                     \
+		size_t l = strlen (buffer)-1;                        \
+	                                                             \
+		if ( buffer[l] == '\n')                              \
+			buffer[l] = '\0';                            \
+		ret = nih_str_array_add (result, parent, len,        \
+			buffer);                                     \
+		TEST_NE_P (ret, NULL);                               \
+	}                                                            \
+	                                                             \
+	TEST_NE (pclose (f), -1);                                    \
+}
+
+/**
+ * CREATE_FILE:
+ *
+ * @dirname: directory name (assumed to already exist),
+ * @name: name of file to create (no leading slash),
+ * @contents: string contents of @name.
+ *
+ * Create a file in the specified directory with the specified
+ * contents.
+ *
+ * Notes: A newline character is added in the case where @contents does
+ * not end with one.
+ **/
+#define CREATE_FILE(dirname, name, contents)                         \
+{                                                                    \
+	FILE    *f;                                                  \
+	char     filename[PATH_MAX];                                 \
+                                                                     \
+	assert (dirname[0]);                                         \
+	assert (name[0]);                                            \
+                                                                     \
+        strcpy (filename, dirname);                                  \
+	if ( name[0] != '/' )                                        \
+	  strcat (filename, "/");                                    \
+        strcat (filename, name);                                     \
+        f = fopen (filename, "w");                                   \
+        TEST_NE_P (f, NULL);                                         \
+        fprintf (f, "%s", contents);                                 \
+	if ( contents[strlen(contents)-1] != '\n')                   \
+          fprintf (f, "\n");                                         \
+        fclose (f);                                                  \
+}
+
+/**
+ * DELETE_FILE:
+ *
+ * @dirname: directory in which file to delete exists,
+ * @name: name of file in @dirname to delete.
+ *
+ * Delete specified file.
+ *
+ **/
+#define DELETE_FILE(dirname, name)                                   \
+{                                                                    \
+	char     filename[PATH_MAX];                                 \
+                                                                     \
+	assert (dirname[0]);                                         \
+	assert (name[0]);                                            \
+                                                                     \
+        strcpy (filename, dirname);                                  \
+	if ( name[0] != '/' )                                        \
+	  strcat (filename, "/");                                    \
+        strcat (filename, name);                                     \
+                                                                     \
+	TEST_EQ (unlink (filename), 0);                              \
+}
+
+/**
+ * _WAIT_FOR_FILE():
+ *
+ * @path: full path to file to look for,
+ * @sleep_secs: number of seconds to sleep per loop,
+ * @loops: number of times to check for file.
+ *
+ * Wait for a reasonable period of time for @path to be created.
+ *
+ * Abort if file does not appear within (sleep_secs * loops) seconds.
+ *
+ * XXX:WARNING: this is intrinsically racy since although the file has
+ * been _created_, it has not necessarily been fully written at the
+ * point this macro signifies success. For that we need inotify or
+ * similar.
+ **/
+#define _WAIT_FOR_FILE(path, sleep_secs, loops)                      \
+{                                                                    \
+	int              ok;                                         \
+	struct stat      statbuf;                                    \
+                                                                     \
+	assert (path[0]);                                            \
+                                                                     \
+	/* Wait for log to be created */                             \
+	ok = FALSE;                                                  \
+	for (int i = 0; i < loops; i++) {                            \
+		sleep (sleep_secs);                                  \
+		if (! stat (logfile, &statbuf)) {                    \
+			ok = TRUE;                                   \
+			break;                                       \
+		}                                                    \
+	}                                                            \
+	TEST_EQ (ok, TRUE);                                          \
+}
+
+/**
+ * WAIT_FOR_FILE():
+ *
+ * @path: full path to file to look for.
+ *
+ * Wait for a "reasonable period of time" for @path to be created.
+ *
+ * Abort if file does not appear within.
+ **/
+#define WAIT_FOR_FILE(path)                                         \
+        _WAIT_FOR_FILE (path, 1, 5)
+
+/**
+ * TEST_STR_MATCH:
+ * @_string: string to check,
+ * @_pattern: pattern to expect.
+ *
+ * Check that @_string matches the glob pattern @_pattern, which
+ * should include the terminating newline if one is expected.
+ *
+ * Notes: Analagous to TEST_FILE_MATCH().
+ **/
+#define TEST_STR_MATCH(_string, _pattern)                            \
+	do {                                                         \
+		if (fnmatch ((_pattern), _string, 0))                \
+			TEST_FAILED ("wrong string value, "          \
+					"expected '%s' got '%s'",    \
+			     (_pattern), _string);                   \
+	} while (0)
+
+/**
+ * _TEST_STR_ARRAY_CONTAINS:
+ *
+ * @_array: string array,
+ * @_pattern: pattern to expect,
+ * @_invert: invert meaning.
+ *
+ * Check that atleast 1 element in @_array matches @_pattern.
+ *
+ * If @_invert is TRUE, ensure @_pattern is _NOT_ found in @_array.
+ **/
+#define _TEST_STR_ARRAY_CONTAINS(_array, _pattern, _invert)          \
+	do {                                                         \
+		char  **p;                                           \
+		int     got = FALSE;                                 \
+                                                                     \
+		for (p = _array; p && *p; p++) {                     \
+                                                                     \
+			if (! fnmatch ((_pattern), *p, 0)) {         \
+				got = TRUE;                          \
+				break;                               \
+			}                                            \
+		}                                                    \
+                                                                     \
+		if (_invert) {                                       \
+		  if (got) {                                         \
+			TEST_FAILED ("wrong content in array "       \
+				"%p (%s), '%s' found unexpectedly",  \
+			     (_array), #_array, (_pattern));         \
+		  }                                                  \
+		} else {                                             \
+		  if (! got) {                                       \
+			TEST_FAILED ("wrong content in array "       \
+				"%p (%s), '%s' not found",           \
+			     (_array), #_array, (_pattern));         \
+		  }                                                  \
+		}                                                    \
+	} while (0)
+
+/**
+ * _TEST_FILE_CONTAINS:
+ * @_file: FILE to read from,
+ * @_pattern: pattern to expect,
+ * @_invert: invert meaning.
+ *
+ * Check that any subsequent line in file @_file matches the glob pattern
+ * @_pattern, which should include the terminating newline if one is expected.
+ *
+ * If @_invert is TRUE, ensure @_pattern is _NOT_ found in @_file.
+ **/
+#define _TEST_FILE_CONTAINS(_file, _pattern, _invert)                \
+	do {                                                         \
+		char   buffer[1024];                                 \
+		int    got = FALSE;                                  \
+		int    ret;                                          \
+		while (fgets (buffer, sizeof (buffer), _file)) {     \
+                                                                     \
+			ret = fnmatch ((_pattern), buffer, 0);       \
+                                                                     \
+			if (! ret) {                                 \
+				got = TRUE;                          \
+				break;                               \
+			}                                            \
+		}                                                    \
+                                                                     \
+		if (_invert) {                                       \
+		    if (got) {                                       \
+			TEST_FAILED ("wrong content in file "        \
+				"%p (%s), '%s' found unexpectedly",  \
+			     (_file), #_file, (_pattern));           \
+		    }                                                \
+		} else {                                             \
+		    if (! got) {                                     \
+			TEST_FAILED ("wrong content in file "        \
+				"%p (%s), '%s' not found",           \
+			     (_file), #_file, (_pattern));           \
+		    }                                                \
+		}                                                    \
+	} while (0)
+
+
+/**
+ * TEST_FILE_CONTAINS:
+ * @_file: FILE to read from,
+ * @_pattern: pattern to expect.
+ *
+ * Check that any subsequent line in file @_file matches the glob pattern
+ * @_pattern, which should include the terminating newline if one is expected.
+ *
+ **/
+#define TEST_FILE_CONTAINS(_file, _pattern)                          \
+	_TEST_FILE_CONTAINS(_file, _pattern, FALSE)
+
+/**
+ * TEST_FILE_NOT_CONTAINS:
+ * @_file: FILE to read from,
+ * @_pattern: pattern NOT to expect.
+ *
+ * Check that no subsequent line in file @_file does NOT match the glob pattern
+ * @_pattern, which should include the terminating newline if one is expected.
+ *
+ **/
+#define TEST_FILE_NOT_CONTAINS(_file, _pattern)                      \
+	_TEST_FILE_CONTAINS(_file, _pattern, TRUE)
+
+/**
+ * TEST_STR_ARRAY_CONTAINS:
+ *
+ * @_array: string array,
+ * @_pattern: pattern to expect.
+ *
+ * Check that atleast 1 element in @_array matches @_pattern.
+ **/
+#define TEST_STR_ARRAY_CONTAINS(_array, _pattern)                    \
+        _TEST_STR_ARRAY_CONTAINS (_array, _pattern, FALSE)
+
+/**
+ * TEST_STR_ARRAY_NOT_CONTAINS:
+ *
+ * @_array: string array,
+ * @_pattern: pattern to expect.
+ *
+ * Check that no element in @_array matches @_pattern.
+ **/
+#define TEST_STR_ARRAY_NOT_CONTAINS(_array, _pattern)                \
+        _TEST_STR_ARRAY_CONTAINS (_array, _pattern, TRUE)
+
+extern int test_user_mode;
+
+/* Prototypes */
+int set_upstart_session (void)
+	__attribute__ ((warn_unused_result));
+
+void wait_for_upstart (int user);
+
+pid_t timed_waitpid (pid_t pid, time_t timeout)
+	__attribute__ ((warn_unused_result));
+
+char * get_initctl (void)
+	__attribute__ ((warn_unused_result));
+
+void _start_upstart (pid_t *pid, int user, char * const *args);
+
+void start_upstart_common (pid_t *pid, int user, const char *confdir,
+		      const char *logdir, char * const *extra);
+
+void start_upstart (pid_t *pid);
+
+pid_t job_to_pid (const char *job)
+	__attribute__ ((warn_unused_result));
+
+int string_check (const char *a, const char *b)
+	__attribute__ ((warn_unused_result));
+
+const char * get_upstart_binary (void)
+	__attribute__ ((warn_unused_result));
+
+const char * get_initctl_binary (void)
+	__attribute__ ((warn_unused_result));
+
+int strcmp_compar (const void *a, const void *b)
+	__attribute__ ((warn_unused_result));
+
+char *get_session_file (const char *xdg_runtime_dir, pid_t pid)
+	__attribute__ ((warn_unused_result));
+
+#endif /* TEST_UTIL_H */

=== modified file 'util/Makefile.am'
--- util/Makefile.am	2013-03-04 11:44:49 +0000
+++ util/Makefile.am	2013-05-30 13:17:28 +0000
@@ -10,14 +10,8 @@
 	-DINITCTL_BUILD \
 	-DSBINDIR="\"$(sbindir)\"" \
 	-I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
-	-I$(top_srcdir)/intl
-
-INITCTL_BINARY = $(abs_builddir)/initctl
-UPSTART_BINARY = $(abs_builddir)/../init/init
-
-AM_CPPFLAGS += \
-	-DUPSTART_BINARY="\"$(UPSTART_BINARY)\"" \
-	-DINITCTL_BINARY="\"$(INITCTL_BINARY)\""
+	-I$(top_srcdir)/intl \
+	-I$(top_srcdir)/test -iquote $(top_srcdir)/test
 
 dist_man_MANS = \
 	man/initctl.8 \
@@ -27,7 +21,6 @@
 	man/telinit.8 \
 	man/runlevel.7
 
-
 sbin_PROGRAMS = \
 	initctl \
 	reboot \
@@ -189,7 +182,6 @@
 	  rm -f "$(DESTDIR)$(sbindir)/$$file"; \
 	done
 
-
 TESTS = \
 	test_initctl \
 	test_utmp \
@@ -206,6 +198,7 @@
 test_initctl_LDADD = \
 	com.ubuntu.Upstart.o \
 	com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
+	$(top_builddir)/test/libtest_util.a \
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS)

=== modified file 'util/tests/test_initctl.c'
--- util/tests/test_initctl.c	2013-02-27 11:46:04 +0000
+++ util/tests/test_initctl.c	2013-05-30 13:17:28 +0000
@@ -53,882 +53,7 @@
 
 #include "com.ubuntu.Upstart.h"
 
-
-#ifndef UPSTART_BINARY
-#error unable to find init binary as UPSTART_BINARY not defined
-#endif /* UPSTART_BINARY */
-
-#ifndef INITCTL_BINARY
-#error unable to find initctl binary as INITCTL_BINARY not defined
-#endif /* INITCTL_BINARY */
-
-#define BUFFER_SIZE 1024
-
-/**
- * TEST_QUIESCE_WAIT_PHASE:
- *
- * Maximum time we expect upstart to wait in the QUIESCE_PHASE_WAIT
- * phase.
- **/
-#define TEST_EXIT_TIME 5
-
-/**
- * TEST_QUIESCE_KILL_PHASE:
- *
- * Maximum time we expect upstart to wait in the QUIESCE_PHASE_KILL
- * phase.
- **/
-#define TEST_QUIESCE_KILL_PHASE 5
-
-#define TEST_QUIESCE_TOTAL_WAIT_TIME (TEST_EXIT_TIME + TEST_QUIESCE_KILL_PHASE)
-
-/* A 'reasonable' path, but which also contains a marker at the end so
- * we know when we're looking at a PATH these tests have set.
- */
-#define TEST_INITCTL_DEFAULT_PATH "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/wibble"
-
-/* Default value for TERM if not already set */
-#define TEST_INITCTL_DEFAULT_TERM "linux"
-
-int
-set_upstart_session (void);
-
-/**
- * wait_for_upstart:
- *
- * @user: TRUE if waiting for a Session Init (which uses a private bus
- * rather than the session bus), else FALSE.
- *
- * Wait for Upstart to appear on D-Bus denoting its completion of
- * initialisation. Wait time is somewhat arbitrary (but more
- * than adequate!).
- **/
-void
-wait_for_upstart (int user)
-{
-	nih_local NihDBusProxy *upstart = NULL;
-	DBusConnection         *connection;
-	char                   *address;
-	NihError               *err;
-	int                     running = FALSE;
-
-	/* XXX: arbitrary value */
-	int                     attempts = 10;
-
-	if (user) {
-		set_upstart_session ();
-		address = getenv ("UPSTART_SESSION");
-	} else {
-		address = getenv ("DBUS_SESSION_BUS_ADDRESS");
-	}
-
-	TEST_TRUE (address);
-
-	while (attempts) {
-		attempts--;
-		sleep (1);
-		connection = nih_dbus_connect (address, NULL);
-
-		if (! connection) {
-			err = nih_error_get ();
-			nih_free (err);
-			continue;
-		}
-
-		upstart = nih_dbus_proxy_new (NULL, connection,
-				      	      NULL,
-					      DBUS_PATH_UPSTART,
-				      	      NULL, NULL);
-
-		if (! upstart) {
-			err = nih_error_get ();
-			nih_free (err);
-			dbus_connection_unref (connection);
-		} else {
-			running = TRUE;
-			break;
-		}
-	}
-	TEST_EQ (running, TRUE);
-}
-
-/**
- * START_UPSTART:
- *
- * @pid: pid_t that will contain pid of running instance on success,
- * @user_mode: TRUE for Session Init (or FALSE to use D-Bus
- * session bus).
- *
- * Start an instance of Upstart and return PID in @pid.
- **/
-#define START_UPSTART(pid, user_mode)                                \
-	start_upstart_common (&(pid), user_mode, NULL, NULL, NULL)
-
-/**
- * KILL_UPSTART:
- *
- * @pid: pid of upstart to kill,
- * @signo: signal number to send to @pid,
- * @wait: TRUE to wait for @pid to die.
- *
- * Send specified signal to upstart process @pid.
- **/
-#define KILL_UPSTART(pid, signo, wait)                               \
-{                                                                    \
-	int status;                                                  \
-	assert (pid);                                                \
-	assert (signo);                                              \
-	                                                             \
-	assert0 (kill (pid, signo));                                 \
-	if (wait) {                                                  \
-		TEST_EQ (waitpid (pid, &status, 0), pid);            \
-		TEST_TRUE (WIFSIGNALED (status));                    \
-		TEST_TRUE (WTERMSIG (status) == signo);              \
-	}                                                            \
-	/* reset since a subsequent start could specify a different  \
-	 * user_mode value.                                          \
-	 */                                                          \
-	test_user_mode = FALSE;                                      \
-}
-
-/**
- * STOP_UPSTART:
- *
- * @pid: pid of upstart to kill.
- *
- * Stop upstart process @pid.
- **/
-#define STOP_UPSTART(pid)                                            \
-	KILL_UPSTART (pid, SIGKILL, TRUE)
-
-/**
- * REEXEC_UPSTART:
- *
- * @pid: pid of upstart.
- *
- * Force upstart to perform a re-exec.
- **/
-#define REEXEC_UPSTART(pid)                                          \
-	KILL_UPSTART (pid, SIGTERM, FALSE);                          \
-	wait_for_upstart (FALSE)
-
-/**
- * RUN_COMMAND:
- *
- * @parent: pointer to parent object,
- * @cmd: string representing command to run,
- * @result: "char ***" pointer which will contain an array of string
- * values corresponding to lines of standard output generated by @cmd,
- * @len: size_t pointer which will be set to length of @result.
- *
- * Run a command and return its standard output. It is the callers
- * responsibility to free @result. Errors from running @cmd are fatal.
- *
- * Note: trailing '\n' characters are removed in returned command
- * output.
- **/
-#define RUN_COMMAND(parent, cmd, result, len)                        \
-{                                                                    \
-	FILE    *f;                                                  \
-	char     buffer[BUFFER_SIZE];                                \
-	char   **ret;                                                \
-	                                                             \
-	assert (cmd[0]);                                             \
-	                                                             \
-	*(result) = nih_str_array_new (parent);                      \
-	TEST_NE_P (*result, NULL);                                   \
-	*(len) = 0;                                                  \
-	                                                             \
-	f = popen (cmd, "r");                                        \
-	TEST_NE_P (f, NULL);                                         \
-	                                                             \
-	while (fgets (buffer, BUFFER_SIZE, f)) {                     \
-		size_t l = strlen (buffer)-1;                        \
-	                                                             \
-		if ( buffer[l] == '\n')                              \
-			buffer[l] = '\0';                            \
-		ret = nih_str_array_add (result, parent, len,        \
-			buffer);                                     \
-		TEST_NE_P (ret, NULL);                               \
-	}                                                            \
-	                                                             \
-	TEST_NE (pclose (f), -1);                                    \
-}
-
-/**
- * CREATE_FILE:
- *
- * @dirname: directory name (assumed to already exist),
- * @name: name of file to create (no leading slash),
- * @contents: string contents of @name.
- *
- * Create a file in the specified directory with the specified
- * contents.
- *
- * Notes: A newline character is added in the case where @contents does
- * not end with one.
- **/
-#define CREATE_FILE(dirname, name, contents)                         \
-{                                                                    \
-	FILE    *f;                                                  \
-	char     filename[PATH_MAX];                                 \
-                                                                     \
-	assert (dirname[0]);                                         \
-	assert (name[0]);                                            \
-                                                                     \
-        strcpy (filename, dirname);                                  \
-	if ( name[0] != '/' )                                        \
-	  strcat (filename, "/");                                    \
-        strcat (filename, name);                                     \
-        f = fopen (filename, "w");                                   \
-        TEST_NE_P (f, NULL);                                         \
-        fprintf (f, "%s", contents);                                 \
-	if ( contents[strlen(contents)-1] != '\n')                   \
-          fprintf (f, "\n");                                         \
-        fclose (f);                                                  \
-}
-
-/**
- * DELETE_FILE:
- *
- * @dirname: directory in which file to delete exists,
- * @name: name of file in @dirname to delete.
- *
- * Delete specified file.
- *
- **/
-#define DELETE_FILE(dirname, name)                                   \
-{                                                                    \
-	char     filename[PATH_MAX];                                 \
-                                                                     \
-	assert (dirname[0]);                                         \
-	assert (name[0]);                                            \
-                                                                     \
-        strcpy (filename, dirname);                                  \
-	if ( name[0] != '/' )                                        \
-	  strcat (filename, "/");                                    \
-        strcat (filename, name);                                     \
-                                                                     \
-	TEST_EQ (unlink (filename), 0);                              \
-}
-
-/**
- * _WAIT_FOR_FILE():
- *
- * @path: full path to file to look for,
- * @sleep_secs: number of seconds to sleep per loop,
- * @loops: number of times to check for file.
- *
- * Wait for a reasonable period of time for @path to be created.
- *
- * Abort if file does not appear within (sleep_secs * loops) seconds.
- *
- * XXX:WARNING: this is intrinsically racy since although the file has
- * been _created_, it has not necessarily been fully written at the
- * point this macro signifies success. For that we need inotify or
- * similar.
- **/
-#define _WAIT_FOR_FILE(path, sleep_secs, loops)                      \
-{                                                                    \
-	int              ok;                                         \
-	struct stat      statbuf;                                    \
-                                                                     \
-	assert (path[0]);                                            \
-                                                                     \
-	/* Wait for log to be created */                             \
-	ok = FALSE;                                                  \
-	for (int i = 0; i < loops; i++) {                            \
-		sleep (sleep_secs);                                  \
-		if (! stat (logfile, &statbuf)) {                    \
-			ok = TRUE;                                   \
-			break;                                       \
-		}                                                    \
-	}                                                            \
-	TEST_EQ (ok, TRUE);                                          \
-}
-
-/**
- * WAIT_FOR_FILE():
- *
- * @path: full path to file to look for.
- *
- * Wait for a "reasonable period of time" for @path to be created.
- *
- * Abort if file does not appear within.
- **/
-#define WAIT_FOR_FILE(path)                                         \
-        _WAIT_FOR_FILE (path, 1, 5)
-
-/**
- * TEST_STR_MATCH:
- * @_string: string to check,
- * @_pattern: pattern to expect.
- *
- * Check that @_string matches the glob pattern @_pattern, which
- * should include the terminating newline if one is expected.
- *
- * Notes: Analagous to TEST_FILE_MATCH().
- **/
-#define TEST_STR_MATCH(_string, _pattern)                            \
-	do {                                                         \
-		if (fnmatch ((_pattern), _string, 0))                \
-			TEST_FAILED ("wrong string value, "          \
-					"expected '%s' got '%s'",    \
-			     (_pattern), _string);                   \
-	} while (0)
-
-/**
- * _TEST_STR_ARRAY_CONTAINS:
- *
- * @_array: string array,
- * @_pattern: pattern to expect,
- * @_invert: invert meaning.
- *
- * Check that atleast 1 element in @_array matches @_pattern.
- *
- * If @_invert is TRUE, ensure @_pattern is _NOT_ found in @_array.
- **/
-#define _TEST_STR_ARRAY_CONTAINS(_array, _pattern, _invert)          \
-	do {                                                         \
-		char  **p;                                           \
-		int     got = FALSE;                                 \
-                                                                     \
-		for (p = _array; p && *p; p++) {                     \
-                                                                     \
-			if (! fnmatch ((_pattern), *p, 0)) {         \
-				got = TRUE;                          \
-				break;                               \
-			}                                            \
-		}                                                    \
-                                                                     \
-		if (_invert) {                                       \
-		  if (got) {                                         \
-			TEST_FAILED ("wrong content in array "       \
-				"%p (%s), '%s' found unexpectedly",  \
-			     (_array), #_array, (_pattern));         \
-		  }                                                  \
-		} else {                                             \
-		  if (! got) {                                       \
-			TEST_FAILED ("wrong content in array "       \
-				"%p (%s), '%s' not found",           \
-			     (_array), #_array, (_pattern));         \
-		  }                                                  \
-		}                                                    \
-	} while (0)
-
-/**
- * _TEST_FILE_CONTAINS:
- * @_file: FILE to read from,
- * @_pattern: pattern to expect,
- * @_invert: invert meaning.
- *
- * Check that any subsequent line in file @_file matches the glob pattern
- * @_pattern, which should include the terminating newline if one is expected.
- *
- * If @_invert is TRUE, ensure @_pattern is _NOT_ found in @_file.
- **/
-#define _TEST_FILE_CONTAINS(_file, _pattern, _invert)                \
-	do {                                                         \
-		char   buffer[1024];                                 \
-		int    got = FALSE;                                  \
-		int    ret;                                          \
-		while (fgets (buffer, sizeof (buffer), _file)) {     \
-                                                                     \
-			ret = fnmatch ((_pattern), buffer, 0);       \
-                                                                     \
-			if (! ret) {                                 \
-				got = TRUE;                          \
-				break;                               \
-			}                                            \
-		}                                                    \
-                                                                     \
-		if (_invert) {                                       \
-		    if (got) {                                       \
-			TEST_FAILED ("wrong content in file "        \
-				"%p (%s), '%s' found unexpectedly",  \
-			     (_file), #_file, (_pattern));           \
-		    }                                                \
-		} else {                                             \
-		    if (! got) {                                     \
-			TEST_FAILED ("wrong content in file "        \
-				"%p (%s), '%s' not found",           \
-			     (_file), #_file, (_pattern));           \
-		    }                                                \
-		}                                                    \
-	} while (0)
-
-
-/**
- * TEST_FILE_CONTAINS:
- * @_file: FILE to read from,
- * @_pattern: pattern to expect.
- *
- * Check that any subsequent line in file @_file matches the glob pattern
- * @_pattern, which should include the terminating newline if one is expected.
- *
- **/
-#define TEST_FILE_CONTAINS(_file, _pattern)                          \
-	_TEST_FILE_CONTAINS(_file, _pattern, FALSE)
-
-/**
- * TEST_FILE_NOT_CONTAINS:
- * @_file: FILE to read from,
- * @_pattern: pattern NOT to expect.
- *
- * Check that no subsequent line in file @_file does NOT match the glob pattern
- * @_pattern, which should include the terminating newline if one is expected.
- *
- **/
-#define TEST_FILE_NOT_CONTAINS(_file, _pattern)                      \
-	_TEST_FILE_CONTAINS(_file, _pattern, TRUE)
-
-/**
- * TEST_STR_ARRAY_CONTAINS:
- *
- * @_array: string array,
- * @_pattern: pattern to expect.
- *
- * Check that atleast 1 element in @_array matches @_pattern.
- **/
-#define TEST_STR_ARRAY_CONTAINS(_array, _pattern)                    \
-        _TEST_STR_ARRAY_CONTAINS (_array, _pattern, FALSE)
-
-/**
- * TEST_STR_ARRAY_NOT_CONTAINS:
- *
- * @_array: string array,
- * @_pattern: pattern to expect.
- *
- * Check that no element in @_array matches @_pattern.
- **/
-#define TEST_STR_ARRAY_NOT_CONTAINS(_array, _pattern)                \
-        _TEST_STR_ARRAY_CONTAINS (_array, _pattern, TRUE)
-
-/* TRUE to denote that Upstart is running in user session mode
- * (FALSE to denote it's using the users D-Bus session bus).
- */
-int test_user_mode = FALSE;
-
-/**
- * set_upstart_session:
- *
- * Attempt to "enter" an Upstart session by setting UPSTART_SESSION to
- * the value of the currently running session.
- *
- * It is only legitimate to call this function if you have previously
- * started a Session Init process.
- *
- * Limitations: Assumes that at most 1 session is running.
- *
- * Returns: TRUE if it was possible to enter the currently running
- * Upstart session, else FALSE.
- **/
-int
-set_upstart_session (void)
-{
-	char                     *value;
-	nih_local char           *cmd = NULL;
-	nih_local char          **output = NULL;
-	size_t                    lines = 0;
-	int                       got = FALSE;
-	int                       i;
-
-	/* XXX: arbitrary value */
-	int                       loops = 5;
-
-	/* list-sessions relies on this */
-	if (! getenv ("XDG_RUNTIME_DIR"))
-		return FALSE;
-
-	cmd = nih_sprintf (NULL, "%s list-sessions 2>&1", INITCTL_BINARY);
-	TEST_NE_P (cmd, NULL);
-
-	/* We expect the list-sessions command to return a valid session
-	 * within a reasonable period of time.
-	 */
-	for (i = 0; i < loops; i++) {
-		sleep (1);
-
-		RUN_COMMAND (NULL, cmd, &output, &lines);
-		if (lines != 1)
-			continue;
-
-		/* No pid in output */
-		if (! isdigit(output[0][0]))
-			continue;
-
-		/* look for separator between pid and value of
-		 * UPSTART_SESSION.
-		 */
-		value = strstr (output[0], " ");
-		if (! value)
-			continue;
-
-		/* jump over space */
-		value  += 1;
-		if (! value)
-			continue;
-
-		/* No socket address */
-		if (strstr (value, "unix:abstract") == value) {
-			got = TRUE;
-			break;
-		}
-	}
-
-	if (got != TRUE)
-		return FALSE;
-
-	assert0 (setenv ("UPSTART_SESSION", value, 1));
-
-	return TRUE;
-}
-
-/**
- * selfpipe:
- *
- * Used to allow a timed process wait.
- **/
-int selfpipe[2] = { -1, -1 };
-
-void
-selfpipe_write (int n)
-{
-    assert (selfpipe[1] != -1);
-
-    (void)write (selfpipe[1], "", 1);
-}
-
-/**
- * selfpipe_setup:
- *
- * Arrange for SIGCHLD to write to selfpipe such that we can select(2)
- * on child process status changes.
- **/
-void
-selfpipe_setup (void)
-{
-    static struct sigaction  act;
-    int                      read_flags;
-    int                      write_flags;
-
-    assert (selfpipe[0] == -1);
-
-    assert (! pipe (selfpipe));
-
-    /* Set non-blocking */
-    read_flags = fcntl (selfpipe[0], F_GETFL);
-    write_flags = fcntl (selfpipe[1], F_GETFL);
-
-    read_flags |= O_NONBLOCK;
-    write_flags |= O_NONBLOCK;
-
-    assert (fcntl (selfpipe[0], F_SETFL, read_flags) == 0);
-    assert (fcntl (selfpipe[1], F_SETFL, write_flags) == 0);
-
-    /* Don't leak */
-    assert (fcntl (selfpipe[0], F_SETFD, FD_CLOEXEC) == 0);
-    assert (fcntl (selfpipe[1], F_SETFD, FD_CLOEXEC) == 0);
-
-    memset (&act, 0, sizeof (act));
-
-    /* register SIGCHLD handler which will cause pipe write when child
-     * changes state.
-     */
-    act.sa_handler = selfpipe_write;
-
-    sigaction (SIGCHLD, &act, NULL);
-}
-
-/**
- * timed_waitpid:
- *
- * @pid: pid to wait for,
- * @timeout: seconds to wait for @pid to change state.
- *
- * Simplified waitpid(2) with timeout using a pipe to allow select(2)
- * with timeout to be used to wait for process state change.
- **/
-pid_t
-timed_waitpid (pid_t pid, time_t timeout)
-{
-    static char     buffer[1];
-    fd_set          read_fds;
-    struct timeval  tv;
-    int             status;
-    int             nfds;
-    int             ret;
-    pid_t           ret2;
-
-    assert (pid);
-    assert (timeout);
-
-    if (selfpipe[0] == -1)
-	    selfpipe_setup ();
-
-    FD_ZERO (&read_fds);
-    FD_SET (selfpipe[0], &read_fds);
-
-    nfds = 1 + selfpipe[0];
-
-    tv.tv_sec   = timeout;
-    tv.tv_usec  = 0;
-
-    /* wait for some activity */
-    ret = select (nfds, &read_fds, NULL, NULL, &tv);
-
-    if (! ret)
-	    /* timed out */
-	    return 0;
-
-    /* discard any data written to pipe */
-    while (read (selfpipe[0], buffer, sizeof (buffer)) > 0)
-	    ;
-
-    while (TRUE) {
-	    /* wait for status change or error */
-	    ret2 = waitpid (pid, &status, WNOHANG);
-
-	    if (ret2 < 0)
-		    return -1;
-
-	    if (! ret2)
-		    /* give child a chance to change state */
-		    sleep (1);
-
-	    if (ret2) {
-		    if (WIFEXITED (status))
-			    return ret2;
-
-		    /* unexpected status change */
-		    return -1;
-	    }
-    }
-}
-
-
-/**
- * get_initctl():
- *
- * Determine a suitable initctl command-line for testing purposes.
- *
- * Returns: Static string representing full path to initctl binary with
- * default option to allow communication with an Upstart started using
- * START_UPSTART().
- **/
-char *
-get_initctl (void)
-{
-	static char path[PATH_MAX + 1024] = { 0 };
-	int         ret;
-
-	ret = sprintf (path, "%s %s",
-			INITCTL_BINARY,
-			test_user_mode
-			? "--user"
-			: "--session");
-
-	assert (ret > 0);
-
-	return path;
-}
-
-/*
- * _start_upstart:
- *
- * @pid: PID of running instance,
- * @user: TRUE if upstart will run in User Session mode (FALSE to
- *  use the users D-Bus session bus),
- * @args: optional list of arguments to specify.
- *
- * Start an instance of Upstart.
- *
- * If the instance fails to start, abort(3) is called.
- **/
-void
-_start_upstart (pid_t *pid, int user, char * const *args)
-{
-	nih_local char  **argv = NULL;
-	sigset_t          child_set, orig_set;
-
-	assert (pid);
-
-	argv = NIH_MUST (nih_str_array_new (NULL));
-
-	NIH_MUST (nih_str_array_add (&argv, NULL, NULL,
-				UPSTART_BINARY));
-
-	if (args)
-		NIH_MUST (nih_str_array_append (&argv, NULL, NULL, args));
-
-	sigfillset (&child_set);
-	sigprocmask (SIG_BLOCK, &child_set, &orig_set);
-
-	TEST_NE (*pid = fork (), -1);
-
-	if (! *pid) {
-		int fd;
-		nih_signal_reset ();
-		sigprocmask (SIG_SETMASK, &orig_set, NULL);
-
-		if (! getenv ("UPSTART_TEST_VERBOSE")) {
-			fd = open ("/dev/null", O_RDWR);
-			assert (fd >= 0);
-			assert (dup2 (fd, STDIN_FILENO) != -1);
-			assert (dup2 (fd, STDOUT_FILENO) != -1);
-			assert (dup2 (fd, STDERR_FILENO) != -1);
-		}
-
-		assert (execv (argv[0], argv) != -1);
-	}
-
-	sigprocmask (SIG_SETMASK, &orig_set, NULL);
-	wait_for_upstart (user);
-}
-
-/**
- * start_upstart_common:
- *
- * @pid: PID of running instance,
- * @user: TRUE if upstart should run in User Session mode (FALSE to
- * use the users D-Bus session bus),
- * @confdir: full path to configuration directory,
- * @logdir: full path to log directory,
- * @extra: optional extra arguments.
- *
- * Wrapper round _start_upstart() which specifies common options.
- **/
-void
-start_upstart_common (pid_t *pid, int user, const char *confdir,
-		      const char *logdir, char * const *extra)
-{
-	nih_local char  **args = NULL;
-
-	assert (pid);
-
-	args = NIH_MUST (nih_str_array_new (NULL));
-
-	if (user) {
-		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-					"--user"));
-		test_user_mode = TRUE;
-	} else {
-		TEST_TRUE (getenv ("DBUS_SESSION_BUS_ADDRESS"));
-		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-					"--session"));
-	}
-
-	NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-				"--no-startup-event"));
-
-	NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-				"--no-sessions"));
-
-	NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-				"--no-inherit-env"));
-
-	if (confdir) {
-		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-					"--confdir"));
-		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-					confdir));
-	}
-
-	if (logdir) {
-		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-					"--logdir"));
-		NIH_MUST (nih_str_array_add (&args, NULL, NULL,
-					logdir));
-	}
-
-	if (extra)
-		NIH_MUST (nih_str_array_append (&args, NULL, NULL, extra));
-
-	_start_upstart (pid, user, args);
-}
-
-/**
- * start_upstart:
- *
- * @pid: PID of running instance.
- *
- * Wrapper round _start_upstart() which just runs an instance with no
- * options.
- **/
-void
-start_upstart (pid_t *pid)
-{
-	start_upstart_common (pid, FALSE, NULL, NULL, NULL);
-}
-
-/**
- * job_to_pid:
- *
- * @job: job name.
- *
- * Determine pid of running job.
- *
- * WARNING: it is the callers responsibility to ensure that
- * @job is still running when this function is called!!
- *
- * Returns: pid of job, or -1 if not found.
- **/
-pid_t
-job_to_pid (const char *job)
-{
-	pid_t            pid;
-	regex_t          regex;
-	regmatch_t       regmatch[2];
-	int              ret;
-	nih_local char  *cmd = NULL;
-	nih_local char  *pattern = NULL;
-	size_t           lines;
-	char           **status;
-	nih_local char  *str_pid = NULL;
-
-	assert (job);
-
-	pattern = NIH_MUST (nih_sprintf
-			(NULL, "^\\b%s\\b .*, process ([0-9]+)", job));
-
-	cmd = NIH_MUST (nih_sprintf (NULL, "%s status %s 2>&1",
-			get_initctl (), job));
-	RUN_COMMAND (NULL, cmd, &status, &lines);
-	TEST_EQ (lines, 1);
-
-	ret = regcomp (&regex, pattern, REG_EXTENDED);
-	assert0 (ret);
-
-	ret = regexec (&regex, status[0], 2, regmatch, 0);
-	if (ret == REG_NOMATCH) {
-		ret = -1;
-		goto out;
-	}
-	assert0 (ret);
-
-	if (regmatch[1].rm_so == -1 || regmatch[1].rm_eo == -1) {
-		ret = -1;
-		goto out;
-	}
-
-	/* extract the pid */
-	NIH_MUST (nih_strncat (&str_pid, NULL,
-			&status[0][regmatch[1].rm_so],
-			regmatch[1].rm_eo - regmatch[1].rm_so));
-
-	nih_free (status);
-
-	pid = (pid_t)atol (str_pid);
-
-	/* check it's running */
-	ret = kill (pid, 0);
-	if (! ret)
-		ret = pid;
-
-out:
-	regfree (&regex);
-	return ret;
-}
+#include "test_util.h"
 
 extern int use_dbus;
 extern int user_mode;
@@ -11744,12 +10869,6 @@
 	dbus_shutdown ();
 }
 
-int
-strcmp_compar (const void *a, const void *b)
-{
-	return strcmp(*(char * const *)a, *(char * const *)b);
-}
-
 void
 test_list (void)
 {
@@ -12071,7 +11190,7 @@
 	TEST_FEATURE ("with no instances and XDG_RUNTIME_DIR unset");
 
 	assert0 (unsetenv ("XDG_RUNTIME_DIR"));
-	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);
 	RUN_COMMAND (NULL, cmd, &output, &lines);
 	TEST_EQ (lines, 1);
@@ -12083,7 +11202,7 @@
 
 	TEST_EQ (setenv ("XDG_RUNTIME_DIR", dirname, 1), 0);
 
-	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);
 	RUN_COMMAND (NULL, cmd, &output, &lines);
 	TEST_EQ (lines, 0);
@@ -12100,8 +11219,7 @@
 
 	start_upstart_common (&upstart_pid, TRUE, NULL, NULL, NULL);
 
-	session_file = nih_sprintf (NULL, "%s/upstart/sessions/%d.session",
-			dirname, (int)upstart_pid);
+	session_file = get_session_file (dirname, upstart_pid);
 
 	/* session file should now have been created by Upstart */
 	TEST_EQ (stat (session_file, &statbuf), 0);
@@ -12123,7 +11241,7 @@
 
 	expected = nih_sprintf (NULL, "%d %s", (int)upstart_pid, value);
 
-	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);
 	RUN_COMMAND (NULL, cmd, &output, &lines);
 	TEST_EQ (lines, 1);
@@ -17379,7 +16497,7 @@
 	TEST_DBUS (dbus_pid);
 	start_upstart_common (&upstart_pid, TRUE, confdir, logdir, NULL);
 
-	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);
 	RUN_COMMAND (NULL, cmd, &output, &lines);
 	TEST_EQ (lines, 1);