Merge lp:~jamesodhunt/ubuntu/oneiric/upstart/1.3 into lp:ubuntu/oneiric/upstart

[James Hunt]

Upstream Upstart 1.3 release.

Original source tarball for Upstart 1.3 is here:

http://launchpad.net/upstart/1.x/1.3/+download/upstart-1.3.tar.gz

Also:

http://launchpad.net/upstart/1.x/1.3/+download/upstart-1.3.tar.gz.asc
http://launchpad.net/upstart/1.x/1.3/+download/upstart-1.3.tar.gz/+md5

Note that we still have user sessions disabled (via D-Bus policy).

=== modified file 'ChangeLog'
--- ChangeLog	2011-05-25 19:38:25 +0000
+++ ChangeLog	2011-06-17 11:15:58 +0000
@@ -1,444 +1,427 @@
-2011-04-27  James Hunt  <[e-mail]>
-
-	* scripts/init-checkconf.sh:
-	  - New function upstart_running.
-	  - We now check to ensure no other instance running.
-	  - Use list command rather than status since the latter requires an
-	    instance variable to be specified (LP: #770532).
-	  - Improve cleanup safety.
-	* scripts/man/init-checkconf.8: Added limitations section.
-
-2011-04-20  James Hunt  <[e-mail]>
-
-	* control_get_job_by_name: Fix to relax session rigidity for user
-	  sessions (allow user sessions to see into the global
-	  namespace for backwards compatability) (LP: #767053).
-
-2011-04-15  James Hunt  <[e-mail]>
-
-	* init/conf.c:
-	  - conf_source_reload_file(): Added missing error return if override
-	    doesn't parse (code path currently unused).
-	  - Documentation updates.
-	* init/job.c: job_new(): Fix for nasty OOM scenario when an attempt is made
-	  to start a chroot job with same name as running single-instance non-chroot
-	  job. Previously, the path for a chrooted Job was set from the (nul) instance
-	  name of its parent JobClass. However, since that job instance name already
-	  existed outside the chroot and was already D-Bus registered,
-	  nih_dbus_object_new() (which allocates storage and is called by
-	  job_register()) returned NULL and kept doing so due to being called
-	  within NIH_MUST(). This resulted in OOM due to an as-yet unidentified
-	  D-Bus bug (possibly a leak in find_subtree_recurse()).
-	* init/session.h: Documentation updates.
-	* util/test_initctl.c: Cleaned up variable names
-	  in RUN_COMMAND macro.
-	* init/parse_job.c: Documentation updates.
-
-2011-04-06  James Hunt  <[e-mail]>
-
-	* init/conf.c: conf_select_job(): Added Session parameter.
-	* init/control.c: control_get_job_by_name(): Handle multiple jobs with same
-	  name (but different session) in job_classes hash.
-	* init/job_class.c:
-	  - job_class_remove(): Added Session parameter.
-	  - job_class_consider(): Handle multiple jobs with same name
-	    (but different session) in job_classes hash.
-	  - job_class_reconsider(): Handle multiple jobs with same name
-	    (but different session) in job_classes hash.
-	  - job_class_remove(): Handle incorrect session.
-	* init/job_process.c: job_process_spawn(): Updated for sessions and
-	  chroots.
-	* init/job_process.h: New enums for: 
-	  - JOB_PROCESS_ERROR_SETUID
-	  - JOB_PROCESS_ERROR_SETGID
-	* init/session.c:
-	  - session_from_dbus(): Added ability to disable sessions.
-	  - Added disable_sessions variable, set via main().
-	* init/session.h: Added tabular comment summarising Session object
-	  contents for different environments.
-	* init/Makefile.am: Reverted special-casing for session.c.
-	* init/main.c: Addition of new command-line option "--no-sessions" to
-	  disable chroot+user sessions (providing a "traditional" Upstart
-	  environment. The primary use for this option is the test suite.
-	* init/man/init.8: Updates for "--no-sessions".
-	* init/tests/test_*.c: Replaced explicit Sessions with NULL
-	  session since tests are not yet session-aware (with the exception of
-	  test_job_process.c, all main() functions now set the
-	  UPSTART_NO_SESSIONS variable to disable sessions).
[phone]  James Hunt  <[e-mail]>
+
+	* NEWS: Release 1.3
+
[phone]  James Hunt  <[e-mail]>
+
+	* contrib/vim/syntax/upstart.vim: Updates for kill, oom, expect
+	and limit.  
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* init/job_process.c (job_process_spawn): Make sure we don't close
+	our own file descriptor if it already has the right value.
+
[phone]  James Hunt  <[e-mail]>
+	
+	Add override file support.
+
+	* init/conf.c:
+	  - conf_reload_path(): Now takes an extra override_path parameter.
+	  - is_conf_file() / is_conf_file_std() / is_conf_file_override(): New
+	    functions to determine type of given file path.
+	  - toggle_conf_name(): New function which convert a conf file
+	    name to an override name and vice versa.
+	  - majority of remaining functions updated to handle override
+	    files.
+	* init/conf.h: Prototypes.
+	* init/job_class.c: Whitespace.
+	* init/man/init.5: Updated to document override file support.
+	* init/man/init.8: Added reference to control-alt-delete(7) man page.
+	* init/paths.h: New macros CONF_EXT_OVERRIDE, CONF_EXT_STD,
+	  IS_CONF_FILE_OVERRIDE and IS_CONF_FILE_STD.
+	* init/parse_conf.c: Added assertion to remind us forcibly to add
+	  override-handling code for directories if we ever allow content in
+	  'init.conf'.
+	* init/parse_job.c (parse_job): Additional parameter 'update' to
+	  allow override files to replace existing Job details.
+	* init/parse_job.h: Updated parse_job() prototype.
+	* init/test_conf.c
+	  - New macros TEST_ENSURE_CLEAN_ENV() and
+	    TEST_FORCE_WATCH_UPDATE().
+	  - test_override(): New function.
+	  - test_toggle_conf_name(): New function.
+	* init/test_parse_job.c:
+	  - Updated for extra parse_job() parameter.
+	  - added a test feature to test_parse_job() to exercise new
+	    parameter to parse_job().
+	* util/man/initctl.8: Clarified what it means to restart a job.
+
+	Add udev and socket bridges.
+	
+	* Makefile.am: Added extra directory.
+	* New files:
+	  - extra/Makefile.am
+	  - extra/conf/upstart-socket-bridge.conf
+	  - extra/conf/upstart-udev-bridge.conf
+	  - extra/man/socket-event.7
+	  - extra/man/upstart-socket-bridge.8
+	  - extra/man/upstart-udev-bridge.8
+	  - extra/upstart-socket-bridge.c
+	  - extra/upstart-udev-bridge.c
+	* configure.ac:
+	  - Check for udev (for upstart-udev-bridge).
+	  - Add extra/Makefile to AC_CONFIG_FILES.
+	* dbus/com.ubuntu.Upstart.xml: Add EmitEventWithFile method.
+	* init/control.c:
+	  - control_emit_event(): Now a wrapper for control_emit_event_with_file.
+	  - control_emit_event_with_file(): New function that operates on an fd.
+	* init/control.h: Prototype for control_emit_event_with_file().
+	* init/event.c:
+	  - event_new(): Initialize event fd.
+	  - event_pending_handle_jobs(): Now calls event_operator_fds().
+	* init/event.c: Add fd to Event struct.
+	* init/event_operator.c: event_operator_fds(): New function.
+	* init/event_operator.h: Prototype for event_operator_fds().
+	* init/job.c: job_new(): Initialize fd members.
+	* init/job.h: Add fds and num_fds to Job struct.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add session support. Note that there are no automatically runnable and
+	explicit tests yet. However, see TESTING.sessions.
+	
+	* TESTING.sessions: ASCII (reStructuredText) document explaining
+	  how to run manual tests for session support (for chroots).
+	* dbus/Upstart.conf: Simplified to support allowing users to invoke
+	  all methods (since Upstart now isolates commands by user).
+	* init/Makefile.am: Added session.[ch] files.
+	* init/session.c: New file. Note that session_from_dbus() will disable sessions
+	  (by returning the NULL session) if environment variable "UPSTART_NO_SESSIONS"
+	  is set to any value (used by tests).
+	* init/session.h: New file.
+	* init/parse_job.h: parse_job(): Add session pointer to prototype.
+	* init/parse_job.c:
+	  - parse_job(): Add session parameter.
+	  - Update calls to job_class_new() to pass session pointer.
+	* init/job.c: job_new(): Crucial change to ensure chroot sessions have
+	  a unique D-Bus name (LP:#728531).
+	* init/job_class.c: 
+	  - job_class_new(): Add session parameter and session support.
+	  - job_class_remove(): Add session parameter to prototype.
+	  - job_class_consider(): Only consider jobs from the appropriate session.
+	  - job_class_reconsider(): Only consider jobs from the appropriate session.
+	  - job_class_start(): Disallow out-of-session modification.
+	  - job_class_stop(): Disallow out-of-session modification.
+	  - job_class_restart(): Disallow out-of-session modification.
+	* init/main.c: Add "--no-sessions" command-line option to disable
+	  sessions and revert to traditional behaviour.
+	* init/job_class.h: 
+	  - job_class_new(): Add session pointer to prototype.
+	  - JobClass: Add session member.
+	* init/job_process.c: job_process_spawn():
+	  - Call chroot(2) for chroot sessions.
+	  - Call setuid(2) for user session jobs.
+	* init/job.c:
+	  - job_emit_event(): Set session for event.
+	  - job_start(): Disallow out-of-session modification.
+	  - job_stop(): Disallow out-of-session modification.
+	  - job_restart(): Disallow out-of-session modification.
+	* init/event.h: Event: Add session member.
+	* init/event.c:
+	  - event_new(): initialize session to NULL.
+	  - event_pending_handle_jobs(): Add session handling.
+	  - event_finished(): Set session for failure event.
+	* init/control.c:
+	  - control_get_job_by_name(): Add session handling.
+	  - control_get_all_jobs(): Add session handling.
+	  - control_emit_event(): Add session handling.
+	* init/conf.c:
+	  - conf_source_new(): Initialise session to NULL.
+	  - conf_reload_path(): Pass session to parse_job().
+	  - conf_select_job(): Add session parameter.
+	* init/conf.h:
+	  - ConfSource: Add session member.
+	  - conf_select_job(): Add session parameter to prototype.
+	* All tests updated to set "UPSTART_NO_SESSIONS" (to disable
+	  sessions).
+
[phone]  James Hunt  <[e-mail]>
+
+	* contrib/bash_completion/upstart:
+	  - Made function names more meaningful:
+	  - _upstart_jobs: Now returns a unique list
+	  - _upstart_events (nee _upstart_named_events ) now considers all
+	    "emits" tokens.
+	  - Updates for "check-config" and "show-config".
+	  - Added "--session" option.
+	  - Added "--no-wait" for emit, reload and restart.
+
+	Man page updates.
+	
+	* init/man/init.5:
+	  - Quoted dashes.
+	  - Explain handling of duplicated stanzas.
+	  - "respawn": Document default count and interval.
+	  - "emits": Reference "initctl check-config".
+	  - Added BUGS section.
+	  - Added copyright.
+	* init/man/init.8:
+	  - Quoted dashes.
+	  - See Also: Added control-alt-delete(7).
+	* util/man/initctl.8:
+	  - Quoted dashes.
+	  - "restart": Clarified meaning.
+	  - "list": Explained "stop/waiting" jobs.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add D-Bus session support to initctl.
+	
+	* util/initctl.c:
+	  - Added "--session" command-line option.
+	  - dbus_bus_type_setter(): New function used by option parser to
+	    distinguish system/session D-Bus bus type.
+	  - system_bus variable now replaced by two others: use_dbus (boolean)
+	    and dbus_bus_type.
+	  - upstart_open(): Updated to handle multiple D-Bus bus types.
+	* util/man/initctl.8: Update for "--session" option.
+	* util/tests/test_initctl.c: Updated to make use of use_dbus and
+	  dbus_bus_type rather than system_bus.
+
+	Add "show-config" command to initctl.
+	
+	* util/initctl.c:
+	  - New functions:
+	    - job_class_condition_handler(): Handler function to retrieve job conditions.
+	    - job_class_condition_err_handler(): Handler error function for
+	      job_class_condition_handler().
+	    - job_class_parse_events(): Convert RPN "start on" and "stop on" conditions to
+	      human-readable format.
+	    - job_class_show_emits(): Display events which job emits.
+	    - job_class_show_conditions(): Make D-Bus calls to retrieve "start on" and
+	      "stop on" conditions.
+	    - show_config_action: Handle "show-config" command..
+	* util/initctl.h: New file providing stack-handling functionality for
+	  RPN parsing for "show-config" command.
+	* util/Makefile.am: Added initctl.h to initctl_SOURCES.
+	* util/man/initctl.8: Updated for "show-config" command and associated
+	  options.
 	* util/tests/test_initctl.c:
-	  - START_UPSTART now specifies "--no-sessions"
-	  - test_check_config(): Added test for "--warn".
-	* scripts/init-checkconf.sh: Script now also checks any script
-	  sections found unless the new "--noscript" option is specified.
-	  Added required "--no-sessions" option to upstart_cmd to ensure Upstart
-	  treats clients requests in traditional manner.
-	* scripts/man/init-checkconf.8: Update for "--noscript".
-	* util/initctl.c: Added "--warn" option for check-config command to
-	  warn if any events or jobs are not known.
-
-2011-03-24  James Hunt  <[e-mail]>
-
-	* init/tests/test_control.c: Added comment.
-	* scripts/initctl2dot.py: Fixes to handle 'emits' glob syntax:
-	  - header(): Change default node to be an event to simplify handling
-	    globs in 'emits' stanzas.
-	  - footer(): Updated for glob event nodes.
-	  - sanitize(): Protect against glob syntax.
-	  - show_event(): Update for glob event nodes.
-	  - show_job(): Explicit specification of record node.
-	  - show_edges(): Handle 'emits' glob syntax.
-
-2011-03-15  James Hunt  <[e-mail]>
-
-	* configure.ac: Bump version to 0.9.3.
-	* NEWS: Entry for version 0.9.3.
-	* conf/rc-sysinit.conf: Added emits stanza for runlevel event.
-	* extra/conf/upstart-socket-bridge.conf: Added emits stanza for socket
-	  event.
-	* extra/conf/upstart-udev-bridge.conf: Added emits stanza for udev class
-	  of events (using globs).
-	* init/man/init.5: Updated emits stanza section to explain use of
-	  wildcard characters.
+	  - New macros START_UPSTART, STOP_UPSTART, RUN_COMMAND, CREATE_FILE and DELETE_FILE.
+	    These are required since due to the introduction of the
+	    "show-config" initctl command, initctl is no longer solely a proxy
+	    to Upstart: it now has some intelligence (it parses the 
+	    "emits", "start on" and "stop on" conditions) and thus must be
+	    tested directly.
+	  - test_show_config(): New function to test "initctl show-config".
+	  - in_chroot(): New function to detect if tests are being run from
+	    within a chroot environment.
+	  - dbus_configured(): New function which performs a basic check to
+	    establish if D-Bus is configured correctly.
+	  - main(): Added call to test_show_config(), conditional on
+	    a non-chroot environment and a working D-Bus system.
+
+	Add "check-config" command to initctl.
+	
 	* util/initctl.c:
 	  - New functions:
+	    - allow_event(): Determine if specified event is erroneous or not.
+	      Handles globbing.
 	    - allow_job(): Determine if specified job is erroneous or not.
 	      Handles variables (such as instance variables).
-	    - allow_event(): Determine if specified event is erroneous or not.
-	      Handles globbing.
-	  - eval_expr_tree():
-	    - Added calls to allow_job() and allow_event().
-	    - Slight simplification of operand-handling code.
-	* util/tests/test_initctl.c: Simplification of dbus_configured().
-
-2011-03-11  James Hunt  <[e-mail]>
-
-	* scripts/Makefile.am: Install improvements for
-	  "make distcheck". Added uninstall for scripts.
-
-2011-03-10  James Hunt  <[e-mail]>
-
-	* extra/conf/upstart-socket-bridge.conf: Start as soon as networking is
-	  available.
-	* extra/man/socket-event.7: Minor typo fixes and troff quoting for
-	  dashes.
-	* extra/man/upstart-socket-bridge.8: Removed reference to socket(8) and
-	  replaced with socket-event(7).
-	* extra/man/upstart-udev-bridge.8: Minor typo fixes, troff quoting for
-	  dashes, and replaced literal quotes with troff quotes.
-	* init/control.c: Typo.
-	* init/main.c: Corrected indentation.
-	* init/man/init.5: Minor typo fixes, troff quoting for
-	  dashes, and replaced literal quotes with troff quotes.
-	* init/man/init.8: Typo.
-	* scripts/init-checkconf.sh: Fixed to ensure safety and portability:
-	    - Quoted all variables.
-	    - Removed non-portable syntax.
-	    - Changed to using getopt(1) rather than getopts(1), and added
-	      long-options.
-	* scripts/initctl2dot.py:
-	    - Changed from os.popen() to (safer)
-	      subprocess.Popen()
-	    - Formatting and typos.
-	* util/initctl.c: Typo.
-	* util/man/initctl.8: Minor typo fixes, troff quoting for
-	  dashes, and replaced literal quotes with troff quotes.
-	* util/tests/test_initctl.c:
-	  - START_UPSTART: improved comments and minor tidyup.
-	  - test_show_config(): Placed tests for expected number of lines of
-	    output *after* checking expected line values. This ensures that if
-	    problems are encountered (for example D-Bus issues), the person
-	    viewing the log has a hope of working out what went wrong :-)
-	  - test_check_config(): As test_show_config().
-	  - dbus_configured(): New function that performs a highly rudimentary
-	    check to see if D-Bus appears to be configured for the environment
-	    the tests run in.
-	  - main(): Improved test for running tests within a chroot: we do now
-	    run all tests assuming that D-Bus is found to be working within a
-	    chroot environment.
-
-2011-03-07  James Hunt  <[e-mail]>
-
-	* extra/man/upstart-udev-bridge.8: Added examples.
-	* extra/Makefile.am: Create links to upstart-udev-bridge
-          man page for well-known Upstart udev events.
-	* util/initctl.h: Improved comments for CheckConfigData.
-	* scripts/init-checkconf.sh:
-	  - cleanup(): Make use of $upstart_pid.
-	  - main(): disown $upstart_pid to stop newer bash versions
-	    displaying changed child process status.
-	* scripts/init2dot.py:
-	  - Removed erroneous check option.
-	  - Improved exaplanation of '-r' option.
-	* scripts/Makefile.am: Added manual pages.
-	* scripts/man/init-checkconf.8: New manual page.
-	* scripts/man/initctl2dot.8: New manual page.
-
-2011-03-04  James Hunt  <[e-mail]>
-
-	* contrib/Makefile.am: Fixed paths and names for scripts.
-	* extra/Makefile.am: Update for upstart-socket-bridge.
-	* util/tests/test_initctl.c:
-	    - in_chroot(): New function to detect if in chroot environment.
-	    - main(): Call in_chroot() to work around bug lp:728988.
-	    - START_UPSTART(): Only try to connect 10 times. Don't use
-	      upstart_open() since this uses the system bus whereas we care
-	      about the session bus. Removed "--debug" as this confuses the
-	      log output.
-	* Moved scripts from "contrib/utils/" to "scripts/" and ensured they
-	  now install on "make install".
-	* Makefile.am: Added scripts directory.
-	* configure.ac: Added scripts/Makefile.   
-	* Packaging changes for socket bridge.
-
-2011-03-03  James Hunt  <[e-mail]>
-
-	* extra/man/socket-event.7: Man page for new socket event.
-	* extra/man/upstart-socket-bridge.8: Man page for socket bridge.
-	* upstart-socket-bridge.conf: configuration file for socket
-	  bridge.
-	* contrib/bash_completion/upstart: Updated for new initctl commands
-	 "show-config" and "check-config".
-	* contrib/utils/init-check.sh: Script to determine if the
-	  specified job configuration file (located outside of /etc/init/)
-	  is valid or not.
-	* contrib/utils/initctl2dot.py: Simply Python script to convert new initctl
-	  output to GraphViz dot format. Example usage:
-	    initctl2dot.py -o - | dot -Tpng -o upstart.png
-	* init/control.h: New define for USE_SESSION_BUS_ENV.
-	* init/control.c:
-	  - control_handle_bus_type(): New function to allow selection of
-	    session bus via env var "UPSTART_USE_SESSION_BUS" (for testing).
-	  - control_bus_open(): Connect to either D-Bus system bus or session bus.
-	* init/man/init.8: Updated for --confdir, --session, --no-startup-event
-	  and --startup-event.
-	* init/main.c:
-	  - Added new options '--startup-event' and '--no-startup-event'.
-	  - Addition of --session and --confdir command-line option (required for
-	    test framework to test changes to initctl).
-	  - handle_confdir(): New function to select alternate confdir using env
-	    var "UPSTART_CONFDIR" (for testing).
-	* init/paths.h:
-	  - Renamed CONDIR to DEFAULT_CONFDIR to make its use clearer now it can be changed.
-	  - Renamed CONFILE to DEFAULT_CONFFILE for parity with DEFAULT_CONFDIR.
-	  - Added define for CONFDIR_ENV.
-	* util/initctl.c:
-	  - Addition of --session command-line option (required for test framework to test
-	    visualisation changes to initctl).
-	  - Changed 'system_bus' variable to 'use_dbus' since now we can use either D-Bus bus type.
-	  - Added 'dbus_bus_type' which encodes D-Bus bus type to use.
-	  - Added 'verbose_detail' and 'enumerate_events' variables to 
-	  - Created new functions:
-	    - show_config_action(): New function to handle 'show-config' command.
-	    - job_class_condition_handler(): Handler function to retrieve job conditions.
-	    - job_class_condition_err_handler(): Handler error function for
-	      job_class_condition_handler().
-	    - job_class_parse_events(): Convert RPN "start on" and "stop on" conditions to
-	      human-readable format.
-	    - job_class_show_emits(): Display events which job emits.
-	    - job_class_show_conditions(): Make D-Bus calls to retrieve "start on" and
-	      "stop on" conditions.
-	    - dbus_bus_type_setter(): Used by option parser to distinguish system/session
-	      D-Bus bus type.
-	    - New functions for check-config command;
-	      - check_config_action: Handler for new check-config command-line
-	        option.
-	      - ignored_events_setter(): handler for '--ignore-events' command-line
-	        option for check-config command.
-	      - eval_expr_tree(): Evaluate expression tree.
-	      - check_condition(): High-level function to handle checking start
-	        on/stop on conditions.
-	      - tree_filter(): Used for filtering expression tree nodes.
-	      - display_check_errors():
-	  - Updated upstart_open() to handle multiple D-Bus bus types.
-	  - status_action() and list_action() modified to call:
-	    - job_class_show_emits()
-	    - job_class_show_conditions()
-	* util/initctl.h: New file providing:
-	  - stack-handling functionality for RPN parsing
-	  - New macros:
-	    - GET_JOB_NAME(): Determine if specified token refers to a job and
-	      return it if true.
-	    - IS_INIT_EVEN(): Determine if specified event is an internally
-	      generated event.
-	    - MAKE_EXPR_NODE(): Create an ExprNode object.
-	    - MAKE_JOB_CONDITION(): Create a JobCondition object.
-	  - New types required for check-config command:
-	    - CheckConfigData
-	    - JobCondition
-	    - ConditionHandlerData
-	    - ExprNode
-	* util/man/initctl.8:
-	  - Updated for show-config section showing new "--enumerate" format output.
-	  - Added section for check-config command.
-	* util/tests/test_initctl.c:
-	  - added test_show_config() and test_check_config().
-	  - new macros START_UPSTART, STOP_UPSTART, RUN_COMMAND, CREATE_FILE
-	    and DELETE_FILE. These are required since due to the changes in initctl.c, we
-	    actually need to run the initctl binary directly (as that is where all
-	    the emits/start on/stop on parsing occurs). The test stategy adopted is to run
-	    (a second instance of! :-) Upstart as a non-privileged user
-	    connected to the session bus and using an alternate config
-	    directory. Then, by invoking initctl, again connecting to the session
-	    bus, we test the parsing functionality directly.
-
-2011-02-23  James Hunt  <[e-mail]>
-
-	* Fixes to allow "make check" to pass with Session support.
-
-2011-01-21  James Hunt  <[e-mail]>
-
-	* Override file support.
-
-2011-03-03  James Hunt <[e-mail]>
-
-	* contrib/bash_completion/upstart: Updated for new initctl show-config
-	  command. 
-	* contrib/utils/init-checkconf.sh: Added '-i' option to specify path to
-	  init daemon (for test builds). Ensure conf file exists.
-	* contrib/utils/initctl2dot.py: Updated for changed initctl show-config
-	  output.
-	* util/Makefile.am: Added missing initctl.h to initctl_SOURCES.
-	* util/initctl.c:
-	  - New functions to handle new check-config command.
-	    - check_config_action: Handler for new check-config command-line
-	      option.
-	    - ignored_events_setter(): handler for '--ignore-events' command-line
-	      option for check-config command.
-	    - eval_expr_tree(): Evaluate expression tree.
 	    - check_condition(): High-level function to handle checking start
 	      on/stop on conditions.
+	    - check_config_action: Handler for "check-config" command.
+	    - display_check_errors(): Display errors from expression tree nodes
+	      that are in error.
+	    - eval_expr_tree(): Evaluate expression tree.
+	    - ignored_events_setter(): handler for '--ignore-events' command-line
+	      option for "check-config" command.
 	    - tree_filter(): Used for filtering expression tree nodes.
-	    - display_check_errors():
-	  - Removed ENSURE_ROOT() macros since this would conflict with user
-	    sessions.
+	  - show_config_action(): Update for check-config mode.
+	  - job_class_parse_events(): Update for check-config mode.
+	  - job_class_show_emits(): Update for check-config mode.
 	* util/initctl.h:
-	  - New macros:
-	    - GET_JOB_NAME(): Determine if specified token refers to a job and
-	      return it if true.
-	    - IS_INIT_EVEN(): Determine if specified event is an internally
-	      generated event.
-	    - MAKE_EXPR_NODE(): Create an ExprNode object.
-	    - MAKE_JOB_CONDITION(): Create a JobCondition object.
-	  - New types required for check-config command:
-	    - CheckConfigData
-	    - JobCondition
-	    - ConditionHandlerData
-	    - ExprNode
-	* util/man/initctl.8:
-	  - Updated for show-config section showing new "--enumerate" format output.
-	  - Added section for check-config command.
-	* util/tests/test_initctl.c:
-	  - START_UPSTART(): Improved test to ensure Upstart has actually
-	    started.
-	  - STOP_UPSTART(): Improved test to ensure Upstart has actually
-	    stopped.
-	  - test_show_config(): Updated for new show-config --enumerate syntax.
-	  - test_check_config(): New function to test check-config command.
-
-2011-02-17  James Hunt <[e-mail]>
-
-	* contrib/utils/init-check.sh renamed to init-checkconf.sh.
-	* contrib/utils/initct2dot.py:
-	  - updated to call "initctl show-config" 
-	  - Added options to allow specification of all colo(u)rs.
-	  - Added a '--restrict-to-jobs' option to allow a sub-set of all jobs
-	    to be viewed (along with their associated jobs and events).
-	  - Code refactored.
-	* init/main.c:
-	  - Added new options '--startup-event' and '--no-startup-event'.
-	* init/man/init.8: Updated for "initctl show-status".
-	* util/initctl.c:
-	  - Reworked code so that rather than utilizing existing 'list' and
-	    'status' commands, we now have a new command: 'show-status'. This is
-	    more logical since it is obvious what it is doing and it also
-	    doesn't pollute the dynamic data returned by 'status' and 'list' with
-	    purely static info.
-	  - upstart_open(): Improved dbus_bus_type usage (now only default to
-	    system bus).
-	  - show_config_action(): New function to handle 'show-config' command.
-	  - job_class_parse_events(): Fixed uninitialized variable issue and
-	    removed IS_JOB() macro in favour of the ultimately reliable
-	    IS_JOB_EVENT() macro.
-	* util/initctl.h: Only enable stack debugging if DEBUG_STACK defined.
-	  This ensures that "make check" doesn't fail due to stack DEBUG output.
-	* util/man/initctl.8: Updated for new 'show-config' command.
-	* util/tests/test_initctl.c:
-	  - Improved START_UPSTART() and STOP_UPSTART() macros.
-	  - Renamed test_status_and_list_action_detail() to
-	    test_show_config_action() to reflect the new command under test.
-	  - test_show_config_action(): Removed all (now-redundant) tests calling
-	    "initctl status" and "initctl list" and updated for new 'show-config'
-	    command.
-
-2011-02-15  James Hunt <[e-mail]>
-
-	* contrib/bash_completion/upstart: Update for job visualisation.
-	* contrib/utils/init-check.sh: Script to determine if the
-	  specified job configuration file (located outside of /etc/init/)
-	  is valid or not.
-	* contrib/utils/initctl2dot.py: Simple Python script to convert new initctl
-	  output to GraphViz dot format. Example usage:
-	    initctl2dot.py > upstart.dot && dot -Tpng -o upstart.png upstart.dot
-	* dbus/upstart.h: Whitespace fix.
+	  - Added structs for JobCondition, CheckConfigData and ExprNode.
+	  - New macros: MAKE_EXPR_NODE() and MAKE_JOB_CONDITION().
+	* util/tests/test_initctl.c:
+	  - test_check_config(): New function to test "initctl check-config".
+	  - main(): Added call to test_check_config(), conditional on
+	    a non-chroot environment and a working D-Bus system.
+	* util/man/initctl.8: Updated for "check-config" command and associated
+	  options.
+	* conf/rc-sysinit.conf: Added "emits" stanza, required by
+	"check-config".
+
+	Addition of initctl2dot script for visualisation.
+	
+	* Makefile.am: Added scripts directory.
+	* configure.ac: Updated AC_CONFIG_FILES for scripts/Makefile.
+	* scripts/Makefile.am: Makefile for scripts.
+	* scripts/initctl2dot.py: Python script to produce dot(1) graphs of
+	  "initctl show-config" output.
+	* scripts/man/initctl2dot.8: Man page for initctl2dot.py script.
+
+	Addition of init-checkconf script.
+	
+	* scripts/init-checkconf.sh: Script to determine if specified job
+	  config file is valid or not.
+	* scripts/man/init-checkconf.8: Man page for init-checkconf.sh.
+	* scripts/Makefile.am: Added init-checkconf script and man
+	  page.
+
[phone]  James Hunt  <[e-mail]>
+
+	Add command-line option to use D-Bus session bus (for testing).
+	
 	* init/control.c:
+	  - Added new boolean use_session_bus.
+	  - Updated comments.
 	  - control_handle_bus_type(): New function to allow selection of
-	    session bus via env var "UPSTART_USE_SESSION_BUS" (for testing).
-	  - control_bus_open(): Connect to either D-Bus system bus or session bus.
+	    session bus via env var "UPSTART_USE_SESSION_BUS".
+	    Also logs use of session bus if use_session_bus set.
+	  - control_bus_open(): Now connects to either D-Bus system bus or session bus.
 	* init/control.h: New define for USE_SESSION_BUS_ENV.
-	* init/man/init.8: Update for --confdir and --session.
+	* init/main.c: Addition of "--session" command-line option.
+	* init/man/init.8: Update for new "--session" command-line option.
+
+	* Corrected copyright notices.
+
+	Add option to allow alternate location for job config files.
+	
 	* init/main.c:
-	  - Addition of --session and --confdir command-line option (required for
-	    test framework to test changes to initctl).
+	  - Added "--confdir <dir>" command-line option.
 	  - handle_confdir(): New function to select alternate confdir using env
-	    var "UPSTART_CONFDIR" (for testing).
-	* init/paths.h:
-	  - Renamed CONDIR to DEFAULT_CONFDIR to make its use clearer now it can be changed.
-	  - Renamed CONFILE to DEFAULT_CONFFILE for parity with DEFAULT_CONFDIR.
-	  - Added define for CONFDIR_ENV.
-	* util/initctl.c:
-	  - Addition of --session command-line option (required for test framework to test
-	    visualisation changes to initctl).
-	  - Changed 'system_bus' variable to 'use_dbus' since now we can use either D-Bus
-	    bus type.
-	  - Added 'dbus_bus_type' which encodes D-Bus bus type to use.
-	  - Added 'verbose_detail' and 'enumerate_events' variables to 
-	  - Created new functions:
-	    - job_class_condition_handler(): Handler function to retrieve job conditions.
-	    - job_class_condition_err_handler(): Handler error function for
-	      job_class_condition_handler().
-	    - job_class_parse_events(): Convert RPN "start on" and "stop on" conditions to
-	      human-readable format.
-	    - job_class_show_emits(): Display events which job emits.
-	    - job_class_show_conditions(): Make D-Bus calls to retrieve "start on" and
-	      "stop on" conditions.
-	    - dbus_bus_type_setter(): Used by option parser to distinguish system/session
-	      D-Bus bus type.
-	  - Updated upstart_open() to handle multiple D-Bus bus types.
-	  - Changed following functions to error with message if initctl run as
-	    non-root user (without this, you get a very cryptic D-Bus error):
-	    - start_action()
-	    - stop_action()
-	    - restart_action()
-	    - reload_configuration_action()
-	    - log_priority_action()
-	  - status_action() and list_action() modified to call:
-	    - job_class_show_emits()
-	    - job_class_show_conditions()
-	* util/initctl.h: New file providing stack-handling functionality for RPN parsing.
-	* util/initctl.8: Updated for --session, and --detail/-d and
-	  --enumerate/-e options to status and list commands.
-	* util/tests/test_initctl.c:
-	  - new macros START_UPSTART, STOP_UPSTART, RUN_COMMAND, CREATE_FILE and DELETE_FILE.
-	    These are required since due to the changes in initctl.c, we
-	    actually need to run the initctl binary directly (as that is where all
-	    the emits/start on/stop on parsing occurs). The test stategy adopted is to run
-	    (a second instance of! :-) Upstart as a non-privileged user
-	    connected to the session bus and using an alternate config
-	    directory. Then, by invoking initctl, again connecting to the session
-	    bus, we test the parsing functionality directly.
-	  - test_status_and_list_action_detail(): New function to test '-d' and
-	    '-e' options for status and list commands.
-	  - updated all remaining functions to use 'use_dbus' rather than 'system_bus'.
+	    var "UPSTART_CONFDIR" or command-line option (for testing).
+	* init/paths.h: Added define for CONFDIR_ENV.
+	* init/man/init.8: Update for new "--confdir" command-line option.
+
+	Add ability to suppress initial event and/or change its name.
+	
+	* init/main.c: New command-line options: "--no-startup-event" and
+	  "--startup-event". If "--no-startup-event" specified, log message as a
+	  debug aid.
+	* init/man/init.8: Documentation for new command-line options:
+	  "--no-startup-event" and "--startup-event".
+
[phone]  Marc - A. Dahlhaus  <[e-mail]>
+
+	* init/job_class.h (JobClass): Add kill signal member
+	* init/job_class.c (job_class_new): Initialise kill signal
+	* init/tests/test_job_class.c (test_new): Check kill signal initialised
+	correctly.
+	* init/system.c (system_kill): Change to accept a signal rather than
+	a boolean.
+	* init/system.h: Update prototype
+	* init/tests/test_system.c (test_kill): Update tests to pass signals
+	by value.
+	* init/job_process.c (job_process_kill, job_process_kill_timer): Pass
+	the configured kill signal, or SIGKILL, to the function rather than
+	TRUE/FALSE.
+	* init/parse_job.c (stanza_kill): Add parsing for kill signal.
+	* init/tests/test_parse_job.c (test_stanza_kill): Check parsing works
+	* init/errors.h: Add illegal signal error and string.
+	* init/man/init.5: Update documentation
+
+	* init/job_class.h (JobClass): Replace oom_adj with oom_score_adj
+	* init/job_class.c (job_class_new): Replace oom_adj with oom_score_adj.
+	* init/job_process.c (job_process_spawn): Write the new score
+	adjustment, falling back to calculating and writing the old value if
+	necessary.
+	* init/parse_job.c (stanza_oom): Parse both the new and old values,
+	converting the old value to the new value if present.
+	* init/errors.h: Add new error string.
+	* init/man/init.5: Documentation update.
+	* init/tests/test_job_class.c (test_new): Update check.
+	* init/tests/test_parse_job.c (test_stanza_oom): Update tests.
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* init/job_process.c (job_process_run): Always make the shell script
+	fd 9, since that's the highest that shells are required by POSIX to
+	support.  Pass the file descriptor to job_process_spawn()
+	(job_process_run): Accept the extra file descriptor, moving it to fd 9.
+	(job_process_error_read): Add handling for error condition.
+	* init/job_process.h: Adjust prototypes, add constant
+	* init/tests/test_job_process.c (test_spawn): Add argument to call in
+	tests
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* configure.ac: Bump version to 1.3
+	* NEWS: Begin new release
+
+	* NEWS: Release 1.2
+
+	* init/job_process.c (job_process_run): Correct shell redirection;
+	the form we used dosen't work with at least pdksh
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* configure.ac: Bump version to 1.2
+	* NEWS: Begin new release
+
+	* NEWS: Release 1.1
+
+	* configure.ac (NIH_COPYRIGHT): Update
+
+	* init/main.c: Don't close the console until initialization is
+	complete.
+
+	* util/Makefile.am (uninstall-hook): Clean up symlinks on uninstall
+
+	* init/environ.c (environ_all_valid): Only verify that an = is present
+	(environ_valid): Drop this function, the part of POSIX I read about
+	valid environment variable names only applies to other things defined
+	by POSIX, elsewhere it explicitly says Applications may do whatever
+	they like (and even encourages to avoid conflict)
+	(environ_expand_until): Remove validity check for name.
+	* init/environ.h: Update header.
+	* init/tests/test_environ.c (test_valid): Drop tests.
+	(test_all_valid): Drop name tests.
+	(test_expand): Remove illegal expansion test.
+	* init/tests/test_control.c (test_emit_event): Remove the test case for
+	an invalid name in the environment.
+	* init/tests/test_job_class.c (test_start, test_stop)
+	(test_restart): Change the invalid argument tests to use an entry
+	without an = as the invalid test.
+
+	* util/reboot.c: pass '-H' to shutdown when called as 'halt'
+
+	* init/job_process.c (job_process_handler): Check the job's normal exit
+	list, decrease log priority of messages from warning to information if
+	the exit status or signal is in the list.
+	* init/tests/test_job_process.c (test_handler): Change the normal exit
+	test cases to not expect the warning
+
+	* init/job_process.c (job_process_run): Prepend a shell command to the
+	pasted script to force the shell to close the file descriptor being
+	used to paste the script. The shell will already have a new copy when
+	it opened the path.
+
[phone]  James Hunt  <[e-mail]>
+
+	* init/conf.c (conf_source_reload, conf_source_reload_dir): Fix typos
+	in doc-strings
+	* init/job_process.c (job_process_run): Fix typo in doc-string
+	* init/parse_job.c (stanza_env): Fix typo in doc-string
+
[phone]  Patty Langasek  <[e-mail]>
+
+	* init/man/init.5: Grammar fixes
+
[phone]  Jacek Konieczny  <[e-mail]>
+
+	* contrib/vim/syntax/upstart.vim: Further improve syntax hilighting
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* configure.ac: Bump version to 1.1
+	* NEWS: Begin new release
+
+	* NEWS: Release 1.0
+
[phone]  Scott James Remnant  <[e-mail]>
+
+	* configure.ac, NEWS: Bump version to 1.0
+	* TODO: Update.
+
+	* init/tests/test_conf.c (test_source_reload_job_dir): Add tests for
+	a crasher bug when a file is created called ".conf"
+	* init/conf.c (conf_dir_filter): Apply fix for the crasher; check that
+	the character before the ".conf" extension is not "/"
+	* NEWS: Update.
 
 2011-01-06  Petr Lautrbach  <[e-mail]>
 
@@ -500,14 +483,6 @@
 
 2010-12-10  Scott James Remnant  <[e-mail]>
 
-	* Socket bridge and udev bridge support.
-
-2010-12-10  Scott James Remnant  <[e-mail]>
-
-	* Session support (chroots, sessions and user-session).
-
-2010-12-10  Scott James Remnant  <[e-mail]>
-
 	* dbus/upstart.h (DBUS_SERVICE_UPSTART, DBUS_ADDRESS_UPSTART):
 	For debugging purposes, when -DDEBUG is given, change the values of
 	these constants.  You'll need to modify your own D-Bus configuration

=== modified file 'NEWS'
--- NEWS	2011-05-25 19:25:11 +0000
+++ NEWS	2011-06-17 11:15:58 +0000
@@ -1,78 +1,70 @@
-0.9.7  2011-04-20
-
-	* Fix for user sessions to retain backwards compatibility behaviour
-	  where a non-privileged user can enquire on jobs owned by the
-	  global namespace.
-
-0.9.6  2011-04-15
-
-	* Fix for nasty OOM scenario when an attempt is made to start
-	  a chroot job with same name as running single-instance
-	  non-chroot job. Previously, the path for a chrooted Job
-	  was set from the (nul) instance name of its parent JobClass.
-	  However, since that job instance name already existed
-	  outside the chroot and was already D-Bus registered,
-	  nih_dbus_object_new() (which allocates storage and is
-	  called by job_register()) returned NULL and kept doing so
-	  due to being called within NIH_MUST(). This resulted in
-	  OOM due to an as-yet unidentified D-Bus bug (possibly a
-	  leak in find_subtree_recurse()).
-
-0.9.5  2011-04-06
-
-	* Important fixes for user and chroot sessions.
-	* scripts/init-checkconf.sh: Now checks script sections too.
-	* util/initctl.c: Added "--warn" option for check-config command
-	  to warn if any events or jobs are not known.
-
-0.9.4  2011-03-24
-
-	* scripts/initctl2dot.py: Fix to handle 'emits' glob syntax
-	  which was causing script to fail for upstart-udev-bridge.
-
-0.9.3  2011-03-15
-
-	* Added missing emits stanzas for supplied .conf files.
-
-	* Added wildcard/globbing facility to initctl.c (for check-config
-	  command).
-
-	* Updated man page on emits stanza syntax.
-
-0.9.2  2011-03-11
-
-	* Improvements to existing documentation.
-	* scripts/man/init-checkconf.8: New manual page.
-	* scripts/man/initctl2dot.8: New manual page.
-	* packaging improvements (including "make distcheck" fix).
-	* extra/man/upstart-udev-bridge.8: Added examples.
-	* extra/Makefile.am: Create links to upstart-udev-bridge
-          man page for well-known Upstart udev events.
-
-0.9.1  2011-03-03
-
-	* Added supporting documentation for upstart-socket-bridge and
-	  sessions and chroot support.
-
-	* Added job configuration file for upstart-socket-bridge.
-
-	* Added job/event visualisation support. This comprises a new
-	  initctl command, "show-config" which generates human-readable
-	  (and machine parseable) output showing start on, stop on and
-	  emits details for each job. See initctl.8 for further details.
-	  The output from show-config is used by the new script
-	  contrib/utils/initctl2dot.py which graphs the data in GraphViz
-	  format.
-
-	* Added new initctl command check-config allowing unreachable
-	  job conditions to be detected. See initctl.8 for further
-	  details.
-
-	* Added script contrib/utils/init-checkconf.sh which allows
-	  non-privileged users to check job configuration files for syntax
-	  errors prior to installing in /etc/init/.
-
-0.9.0  2011-02-24
+1.4  xxxx-xx-xx
+
+1.3  2011-06-14  "Concordia"
+
+	* New upstart-socket-bridge application which allows jobs to be
+	  started when an incoming client socket connection is initiated
+	  (requires a suitably modified server daemon since jobs only
+	  need call accept(2) before reading from the socket).
+	* User session support allowing non-privileged users to
+	  manipulate their own jobs (not available within a chroot
+	  environment).
+	* Chroot support allowing jobs to be controlled within chroot
+	  environments.
+	* Updated bash completion script.
+	* Updated vim syntax script.
+	* init-checkconf script used to check syntax of Job
+	  Configuration Files (including script sections).
+	* initctl2dot script to convert initctl(8) output to GraphViz
+	  dot(1) format for analysing relationships between jobs and
+	  events.
+	* New "check-config" initctl command to check for jobs whose
+	* "start on" and "stop on" events cannot be satisfied.
+	* New "show-config" initctl command to display "start on", "stop
+	  on" and emits" information in parseable format.
+	* New initctl command-line option: "--session" for D-Bus
+	  session connection.
+	* New init command line options (mostly for testing):
+	  - "--session" for D-Bus session bus.
+	  - "--confdir <dir>".
+	  - "--startup-event <event>".
+	  - "--no-startup-event".
+	* New "kill signal" stanza to allow override of SIGTERM when
+	  stopping jobs.
+	* Add support for the oom_score_adj procfs API.
+	* Improved POSIX compliance when running shell scripts.
+
+1.2  2011-03-22  "This sort of thing is my bag, baby"
+
+	* Fixed incorrect shell redirection syntax that broke at least
+	  pdksh.  (Bug: #739984)
+
+1.1  2011-03-16  "It's probably 'cause you think you're cooler than me"
+
+	* When /sbin/halt is called (without -p), this now results in the
+	  system being halted and not powered down. If you meant it to be
+	  powered down, use /sbin/poweroff.  (Bug: #532366)
+
+	* Fixed file descriptor leak of /proc/self/fd/NN to shell scripts
+	  executed by Upstart.  (Bug: #619269)
+
+	* Fixed bug where console was closed too early, causing loss of error
+	  messages and non-functioning keyboard-request event,
+	  (Bug: #707151)
+
+	* Fixed bug where environment variables containing unusual characters
+	  were not accepted due to a mis-reading of POSIX.  (Bug: #567068).
+
+	* Fixed non-removal of symlinks on "make uninstall".  (Bug: #604227)
+
+	* Reduced priority of job termination messages from warn to info
+	  if the exit status or signal is listed in "normal exit".
+	  (Bug: #522197)
+
+1.0  2011-03-01  "This is a fertile land, and we will thrive"
+
+	* Fixed an assertion when a file named /etc/init/.conf is created.
+	  Discovered by Коренберг Марк (Bug: #720573)
 
 	* utmp entries will be replaced with DEAD_PROCESS ones when a
 	  pid supervised by Upstart terminates.  (Bug: #183729)
@@ -83,29 +75,6 @@
 	* Included bash completion script in contrib directory.
           (Bug: #672067)
 
-	* Addition of Session support (chroots, sessions and
-	  user-session).
-
-	* Socket bridge support allowing jobs to be started based on
-	  socket connections. Examples of supported syntax:
-
-		start on socket PROTO=inet PORT=1234
-		start on socket PROTO=unix PATH=/var/run/.s.pgsql.1234
-		start on socket PROTO=unix PATH=@/at/upstart/example
-
-	* udev bridge support imported from Ubuntu. See
-	  "man 8 upstart-udev-bridge" for further details.
-
-	* Override file support allowing the creation of files named
-	  "<job_conf>.override" whose contents override that found in
-	  "<job_conf>.conf". Useful to modify a job without touching its
-	  .conf file. For example, a job can now be disabled simply by
-	  doing:
-
-		echo "manual" >> /etc/init/jobname.override
-
-	  See "man 5 init" for further details.
-
 0.6.7  2010-12-14  "Return of the Mole"
 
 	* A new "manual" stanza has been added to the configuration, this

=== added file 'TESTING.sessions'
--- TESTING.sessions	1970-01-01 00:00:00 +0000
+++ TESTING.sessions	2011-06-17 11:15:58 +0000
@@ -0,0 +1,263 @@
+.. contents::
+
+=============================
+Testing Sessions with Upstart
+=============================
+
+Upstart now has support for chroots which are implemented by creating a
+separate session for every user within each chroot. It also has partial
+support for user sessions, but since this is experimental (and disabled
+in Ubuntu), this document does not cover testing this feature.
+
+The session support does not yet provide full tests (as would be run by
+"``make check``"). This is partly due to the complexity of automatically
+testing some of the scenarios below.
+
+This document attempts to outline the minimum set of tests that should
+be performed to ensure that chroot support works as expected.
+
+Assumptions
+===========
+
+You are running an Ubuntu or Debian system.
+
+Setup
+=====
+
+#. Install a chroot environement (such as ``schroot(1)``) and configure it.
+#. run, "``debootstrap(8)``" to install the same release as you are running into your chroot.
+#. Create the following files *outside* your chroot.
+
+   - ``/etc/init/foo.conf``::
+     
+       start on wibble
+       
+       script
+         exec 2>>/tmp/foo.$$.log
+         set -x
+         echo "foo: stat=`stat /`" 
+         echo "foo: env=`env`"
+         sleep 999 
+       end script
+
+   - ``/etc/init/outside_chroot.conf``::
+
+       start on A
+          
+       script
+         exec 2>>/tmp/outside_chroot.$$.log
+         set -x
+         echo "in_chroot: stat=`stat /`" 
+         echo "in_chroot: env=`env`"
+         sleep 999 
+       end script
+
+#. Create following files inside chroot environment.
+
+   - ``/path/to/chroot/etc/init/foo.conf``::
+
+       start on wibble
+          
+       script
+         exec 2>>/tmp/foo.$$.log
+         set -x
+         echo "foo: stat=`stat /`" 
+         echo "foo: env=`env`" 
+         sleep 999
+       end script
+
+   - ``/path/to/chroot/etc/init/in_chroot.conf``::
+
+       start on A
+        
+       script
+         exec 2>>/tmp/in_chroot.$$.log
+         set -x
+         echo "in_chroot: stat=`stat /`" 
+         echo "in_chroot: env=`env`" 
+         sleep 999
+       end script
+
+   
+Run as non-``root`` with no chroot
+==================================
+
+- ``initctl list``
+
+  Ensure list is contents of ``/etc/init/``: the command below should
+  return no output::
+
+    cmp <(initctl list|awk '{print $1}'|sort -u) <(cd /etc/init && ls *.conf|cut -d: -f2-|sed 's/\.conf//g'|sort -u)
+
+- ``initctl status cron``
+
+  Should work.
+
+- ``initctl show-config``
+
+  Should work.
+
+- ``initctl check-config``
+
+  Should work.
+
+- ``start foo``
+
+  Should fail ("``initctl: Rejected send message``").
+
+- ``stop cron``
+
+  Should fail ("``initctl: Rejected send message``").
+
+- ``restart cron``
+
+  Should fail ("``initctl: Rejected send message``").
+
+- ``initctl emit bar``
+
+  Should fail ("``initctl: Rejected send message``").
+
+Run as ``root`` with no chroot
+==============================
+
+- ``initctl list``
+
+  Ensure list is contents of ``/etc/init/``: command below should return no output::
+
+    cmp <(initctl list|awk '{print $1}'|sort -u) <(cd /etc/init && ls *.conf|cut -d: -f2-|sed 's/\.conf//g'|sort -u)
+
+- ``initctl status outside_chroot``
+
+  Should work.
+
+- ``initctl status in_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: in_chroot
+
+- ``initctl show-config``
+
+  Should work.
+
+- ``initctl check-config``
+
+  Should work.
+
+- ``start in_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: in_chroot
+
+- ``start outside_chroot``
+
+  Should work.
+
+- ``stop in_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: in_chroot
+
+- ``restart outside_chroot``
+
+  Should work.
+
+- ``stop outside_chroot``
+
+  Should work.
+
+- ``initctl emit wibble``
+
+  - Ensure ``/etc/init/foo.conf`` runs by looking at the log and ensuring
+    the inode for the stat of '``/``' is the same as running "``stat /``" on
+    the command-line.
+
+  * Ensure ``/path/to/chroot/etc/init/foo.conf`` does *NOT* run.
+
+- ``initctl emit A``
+
+  - Ensure ``/etc/init/outside_chroot.conf`` runs.
+
+  - Ensure ``/path/to/chroot/etc/init/in_chroot.conf`` does *NOT* run.
+
+Run as ``root`` inside a chroot
+===============================
+
+- ``initctl list``
+
+  Ensure list is contents of ``/path/to/chroot/etc/init/``: command below should return no output::
+
+    cmp <(initctl list|awk '{print $1}'|sort -u) <(cd /etc/init && ls *.conf|cut -d: -f2-|sed 's/\.conf//g'|sort -u)
+
+- ``initctl status in_chroot``
+
+  Should work.
+
+- ``initctl status outside_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: outside_chroot
+
+- ``initctl show-config``
+
+  Should work.
+
+- ``initctl check-config``
+
+  Should work.
+
+- ``start outside_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: outside_chroot
+
+- ``stop outside_chroot``
+
+  Should fail with message::
+
+    initct: Unknown job: outside_chroot
+
+- ``start in_chroot``
+
+  Should work.
+
+- ``restart in_chroot``
+
+  Should work.
+
+- ``stop in_chroot``
+
+  Should work.
+
+- ``initctl emit wibble``
+
+  - Ensure ``/path/to/chroot/etc/init/foo.conf`` runs by looking at the log and ensuring
+    the inode for the stat of '``/``' is the same as running "``stat /``" on the command-line.
+
+  - Ensure ``/etc/init/foo.conf`` does *NOT* run.
+
+- ``initctl emit A``
+
+  - Ensure ``/path/to/chroot/etc/init/in_chroot.conf`` runs.
+
+  - Ensure ``/etc/init/outside_chroot.conf`` does *NOT* run.
+
+Run as non-root inside a chroot
+===============================
+
+Not supported.
+
+Run with ``--no-sessions``
+==========================
+
+The "``--no-sessions``" option makes Upstart behave as it used to prior to
+the introduction of session support.
+
+#. Reboot system and specify "``--no-sessions``" on kernel command-line.
+
+#. Ensure "``initctl list``" within a chroot displays the same list as
+   "``initctl list``" run outside of any chroot environment.

=== modified file 'TODO'
--- TODO	2010-02-04 08:47:46 +0000
+++ TODO	2011-06-17 11:15:58 +0000
@@ -1,10 +1,4 @@
-Merge 1216.1.1 from Ubuntu (reload command), add test case.
-
-__abort_msg should be weak or changed
-
-
-
-0.6.x series:
+1.x series:
 
  * going into runlevel S from !S, need to stty console
  * going into 6, 0 or 1, need to stty console

=== modified file 'configure'
--- configure	2011-05-25 19:25:11 +0000
+++ configure	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for upstart 0.9.7.
+# Generated by GNU Autoconf 2.67 for upstart 1.3.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -13,7 +13,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright © 2011 Canonical Ltd.
+# Copyright © 2011 Scott James Remnant, Canonical Ltd.
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -703,8 +703,8 @@
 # Identity of this package.
 PACKAGE_NAME='upstart'
 PACKAGE_TARNAME='upstart'
-PACKAGE_VERSION='0.9.7'
-PACKAGE_STRING='upstart 0.9.7'
+PACKAGE_VERSION='1.3'
+PACKAGE_STRING='upstart 1.3'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1511,7 +1511,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures upstart 0.9.7 to adapt to many kinds of systems.
+\`configure' configures upstart 1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1581,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of upstart 0.9.7:";;
+     short | recursive ) echo "Configuration of upstart 1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1723,14 +1723,14 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-upstart configure 0.9.7
+upstart configure 1.3
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright © 2011 Canonical Ltd.
+Copyright © 2011 Scott James Remnant, Canonical Ltd.
 _ACEOF
   exit
 fi
@@ -2326,7 +2326,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by upstart $as_me 0.9.7, which was
+It was created by upstart $as_me 1.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2682,8 +2682,8 @@
 
 
 
-$as_echo "#define PACKAGE_COPYRIGHT \"Copyright (C) 2011 Canonical Ltd.\"" >>confdefs.h
-	PACKAGE_COPYRIGHT="Copyright © 2011 Canonical Ltd."
+$as_echo "#define PACKAGE_COPYRIGHT \"Copyright (C) 2011 Scott James Remnant, Canonical Ltd.\"" >>confdefs.h
+	PACKAGE_COPYRIGHT="Copyright © 2011 Scott James Remnant, Canonical Ltd."
 
 
 
@@ -4481,7 +4481,7 @@
 
 # Define the identity of the package.
  PACKAGE='upstart'
- VERSION='0.9.7'
+ VERSION='1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17364,7 +17364,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile intl/Makefile dbus/Makefile init/Makefile util/Makefile extra/Makefile conf/Makefile doc/Makefile contrib/Makefile po/Makefile.in scripts/Makefile"
+ac_config_files="$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"
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -17898,7 +17898,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by upstart $as_me 0.9.7, which was
+This file was extended by upstart $as_me 1.3, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17964,7 +17964,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-upstart config.status 0.9.7
+upstart config.status 1.3
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -18363,8 +18363,8 @@
     "dbus/Makefile") CONFIG_FILES="$CONFIG_FILES dbus/Makefile" ;;
     "init/Makefile") CONFIG_FILES="$CONFIG_FILES init/Makefile" ;;
     "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
+    "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;;
     "extra/Makefile") CONFIG_FILES="$CONFIG_FILES extra/Makefile" ;;
-    "conf/Makefile") CONFIG_FILES="$CONFIG_FILES conf/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;

=== modified file 'configure.ac'
--- configure.ac	2011-05-25 19:25:11 +0000
+++ configure.ac	2011-06-17 11:15:58 +0000
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([upstart], [0.9.7], [[e-mail]])
-NIH_COPYRIGHT([[Copyright © 2011 Canonical Ltd.]])
+AC_INIT([upstart], [1.3], [[e-mail]])
+NIH_COPYRIGHT([[Copyright © 2011 Scott James Remnant, Canonical Ltd.]])
 AC_CONFIG_SRCDIR([init/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -66,8 +66,8 @@
 
 
 AC_CONFIG_FILES([ Makefile intl/Makefile
-		  dbus/Makefile init/Makefile util/Makefile extra/Makefile
-		  conf/Makefile doc/Makefile contrib/Makefile po/Makefile.in
+		  dbus/Makefile init/Makefile util/Makefile conf/Makefile
+		  extra/Makefile doc/Makefile contrib/Makefile po/Makefile.in
 		  scripts/Makefile ])
 AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT

=== modified file 'contrib/bash_completion/upstart'
--- contrib/bash_completion/upstart	2011-05-25 19:25:11 +0000
+++ contrib/bash_completion/upstart	2011-06-17 11:15:58 +0000
@@ -3,26 +3,28 @@
 #
 # We don't provide completion for 'init' itself for obvious reasons.
 have initctl &&
-_upstart_conf_jobs()
-{
-  initctl list|awk '{print $1}'
-} &&
-_upstart_named_events()
-{
-  (cd /etc/init && grep '^emits ' *.conf|sed 's/^emits //g')
-} &&
-_upstart_events()
-{
-  (_upstart_conf_jobs;_upstart_named_events)|tr ' ' '\n'|sort -u
-} &&
-_upstart_startable_events()
+_upstart_jobs()
+{
+  initctl list|awk '{print $1}'|sort -u
+} &&
+_upstart_startable_jobs()
 {
   initctl list|cut -d\, -f1|awk '$2 == "stop/waiting" {print $1}'
 } &&
-_upstart_stoppable_events()
+_upstart_stoppable_jobs()
 {
   initctl list|cut -d\, -f1|awk '$2 == "start/running" {print $1}'
 } &&
+_upstart_events()
+{
+  # note that we don't provide the internal events such as "starting"
+  # (and those from mountall) since the user should be using the
+  # associated command to emit such events.
+  (cd /etc/init && \
+   egrep '^[[:space:]]*emits ' *.conf |\
+   cut -d: -f2- | sed 's/^[[:space:]]*emits //g' |\
+   tr ' ' '\n' | awk '{print $NF}' | grep -v ^$|sort -u)
+} &&
 _upstart_initctl()
 {
   _get_comp_words_by_ref cur prev
@@ -32,20 +34,34 @@
   case "$prev" in
 
     start)
-      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_startable_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_startable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     stop)
-      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     emit)
-      COMPREPLY=( $(compgen -W "$(_upstart_events)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_events)" -- ${cur}) )
       return 0
     ;;
 
+    -i|--ignore-events)
+      # handle visualisation options after check-config command
+      for cmd in check-config
+      do
+        cwords=${COMP_WORDS[@]##}
+        filtered_cwords=${COMP_WORDS[@]##${cmd}}
+        if [ "$filtered_cwords" != "$cwords" ]
+        then
+          COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
+          return 0
+        fi
+      done
+    ;;
+
     -e|--enumerate)
       # handle visualisation options after show-config command
       for cmd in show-config
@@ -54,36 +70,56 @@
         filtered_cwords=${COMP_WORDS[@]##${cmd}}
         if [ "$filtered_cwords" != "$cwords" ]
         then
-          COMPREPLY=( $(compgen -W "${vis_opts} $(_upstart_conf_jobs)" -- ${cur}) )
+          COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
           return 0
         fi
       done
     ;;
 
     reload|restart)
-      COMPREPLY=( $(compgen -W "$(_upstart_conf_jobs)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-n --no-wait $(_upstart_stoppable_jobs)" -- ${cur}) )
       return 0
     ;;
 
     status)
-      COMPREPLY=( $(compgen -W "${vis_opts} $(_upstart_conf_jobs)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "$(_upstart_jobs)" -- ${cur}) )
       return 0
     ;;
 
+    check-config)
+      COMPREPLY=( $(compgen -W "-w --warn -i --ignore-events= $(_upstart_jobs)" -- ${cur}) )
+      return 0
+    ;;
     show-config)
-      COMPREPLY=( $(compgen -W "-e --enumerate $(_upstart_conf_jobs)" -- ${cur}) )
+      COMPREPLY=( $(compgen -W "-e --enumerate $(_upstart_jobs)" -- ${cur}) )
       return 0
     ;;
 
     -n|--no-wait)
-      # allow no wait after start/stop commands
-      for cmd in start stop
+      # allow 'no wait' for certain commands
+      for cmd in start stop restart emit
       do
         cwords=${COMP_WORDS[@]##}
         filtered_cwords=${COMP_WORDS[@]##${cmd}}
         if [ "$filtered_cwords" != "$cwords" ]
         then
-          COMPREPLY=( $(compgen -W "$(_upstart_${cmd}able_events)" -- ${cur}) )
+          case "$cmd" in
+            start)
+              COMPREPLY=( $(compgen -W "$(_upstart_startable_jobs)" -- ${cur}) )
+            ;;
+
+            stop)
+              COMPREPLY=( $(compgen -W "$(_upstart_stoppable_jobs)" -- ${cur}) )
+            ;;
+
+            restart)
+              COMPREPLY=( $(compgen -W "$(_upstart_stoppable_jobs)" -- ${cur}) )
+            ;;
+
+            emit)
+              COMPREPLY=( $(compgen -W "$(_upstart_events)" -- ${cur}) )
+            ;;
+          esac
           return 0
         fi
       done
@@ -118,7 +154,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_startable_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_startable_jobs)" -- ${cur}) )
   return 0
 } && complete -F _upstart_start start
 
@@ -138,7 +174,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 } && complete -F _upstart_stop stop
 
@@ -158,7 +194,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_restart restart
@@ -178,7 +214,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_status status
@@ -198,7 +234,7 @@
     ;;
   esac
 
-  COMPREPLY=( $(compgen -W "$opts $(_upstart_events)" -- ${cur}) )
+  COMPREPLY=( $(compgen -W "$opts $(_upstart_stoppable_jobs)" -- ${cur}) )
   return 0
 
 } && complete -F _upstart_reload reload

=== modified file 'contrib/vim/syntax/upstart.vim'
--- contrib/vim/syntax/upstart.vim	2009-07-08 19:59:21 +0000
+++ contrib/vim/syntax/upstart.vim	2011-06-17 11:15:58 +0000
@@ -1,10 +1,11 @@
 " Vim syntax file
 " Language:	Upstart job files
 " Maintainer:	Michael Biebl <[e-mail]>
-" Last Change:	2007 Feb 13
+"		James Hunt <[e-mail]>
+" Last Change:	2011 Jun 14
 " License:	GPL v2
-" Version:	0.1
-" Remark:	Syntax highlighting for upstart job files.
+" Version:	0.3
+" Remark:	Syntax highlighting for Upstart (init(8)) job files.
 "
 " It is inspired by the initng syntax file and includes sh.vim to do the
 " highlighting of script blocks.
@@ -16,7 +17,6 @@
 endif
 
 let is_bash = 1
-"unlet! b:current_syntax
 syn include @Shell syntax/sh.vim
 
 syn case match
@@ -31,8 +31,12 @@
 syn cluster upstartShellCluster contains=@Shell
 
 " one argument
-syn keyword upstartStatement description author version
-syn keyword upstartStatement pid kill normal console env umask nice limit chroot chdir exec
+syn keyword upstartStatement description author version instance expect
+syn keyword upstartStatement pid kill normal console env exit export
+syn keyword upstartStatement umask nice oom chroot chdir exec
+
+" two arguments
+syn keyword upstartStatement limit
 
 " one or more arguments (events)
 syn keyword upstartStatement emits
@@ -40,27 +44,62 @@
 syn keyword upstartStatement on start stop
 
 " flag, no parameter
-syn keyword upstartStatement daemon respawn service instance
+syn keyword upstartStatement respawn service instance manual debug task
 
 " prefix for exec or script 
 syn keyword upstartOption pre-start post-start pre-stop post-stop
 
-" options for pid
-syn keyword upstartOption file binary timeout
-" option for 
-syn keyword upstartOption timeout
-" option for respawn
-syn keyword upstartOption limit
+" option for kill
+syn keyword upstartOption timeout signal
+" option for oom
+syn keyword upstartOption score never
 " options for console
-syn keyword upstartOption logged output owner none
-
-syn keyword upstartEvent startup stalled control-alt-delete kbdrequest starting started stopping stopped runlevel
-
-hi def link upstartComment Comment
-hi def link upstartTodo	Todo
-hi def link upstartString String
+syn keyword upstartOption output owner
+" options for expect
+syn keyword upstartOption stop fork daemon none
+" options for limit
+syn keyword upstartOption unlimited core cpu data fsize memlock msgqueue nice
+syn keyword upstartOption nofile nproc rss rtprio sigpending stack
+
+" 'options' for start/stop on
+syn keyword upstartOption and or
+
+" Upstart itself and associated utilities
+syn keyword upstartEvent runlevel
+syn keyword upstartEvent started
+syn keyword upstartEvent starting
+syn keyword upstartEvent startup
+syn keyword upstartEvent stopped
+syn keyword upstartEvent stopping
+syn match   upstartEvent /control-alt-delete/
+syn match   upstartEvent /keyboard-request/
+syn match   upstartEvent /power-status-changed/
+
+" D-Bus
+syn match   upstartEvent /dbus-activation/
+
+" Display Manager (ie gdm)
+syn match   upstartEvent /desktop-session-start/
+syn match   upstartEvent /login-session-start/
+
+" mountall
+syn keyword upstartEvent filesystem
+syn keyword upstartEvent mounted
+syn keyword upstartEvent mounting
+syn match   upstartEvent /\(\<local\>\|\<virtual\>\|\<remote\>\)-filesystems/
+syn match   upstartEvent /all-swaps/
+
+" upstart-udev-bridge and ifup/down
+syn match   upstartEvent /\<\i\{-1,}-device-\(\<added\>\|\<removed\>\|\<up\>\|\<down\>\)/
+
+" upstart-socket-bridge
+syn keyword upstartEvent socket
+
+hi def link upstartComment   Comment
+hi def link upstartTodo	     Todo
+hi def link upstartString    String
 hi def link upstartStatement Statement
-hi def link upstartOption Type
-hi def link upstartEvent Define
+hi def link upstartOption    Type
+hi def link upstartEvent     Define
 
 let b:current_syntax = "upstart"

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-25 19:38:25 +0000
+++ debian/changelog	2011-06-17 11:15:58 +0000
@@ -1,3 +1,24 @@
+upstart (1.3-0ubuntu3) oneiric; urgency=low
+
+  * init/paths.h: Syned with upstream since Ubuntu file appears to have
+    diff applied twice, causing redefines.
+
+ -- James Hunt <[e-mail]>  Fri, 17 Jun 2011 09:59:49 +0100
+
+upstart (1.3-0ubuntu2) oneiric; urgency=low
+
+  * init/Makefile.am: Sync up from upstream, dropping TEST define which is
+    no longer required now we set UPSTART_NO_SESSIONS for init/tests/*.c
+    and specify "--no-sessions" for util/tests/*.c.
+
+ -- James Hunt <[e-mail]>  Fri, 17 Jun 2011 09:47:36 +0100
+
+upstart (1.3-0ubuntu1) oneiric; urgency=low
+
+  * Merge of Upstart 1.3 (lp:upstart @ 1.3 release tag).
+
+ -- James Hunt <[e-mail]>  Thu, 16 Jun 2011 15:09:41 +0100
+
 upstart (0.9.7-3) oneiric; urgency=low
 
   * Merge of upstream lp:~upstart-devel/upstart/0.9: Updates for

=== modified file 'extra/Makefile.am'
--- extra/Makefile.am	2011-05-25 19:25:11 +0000
+++ extra/Makefile.am	2011-06-17 11:15:58 +0000
@@ -74,7 +74,6 @@
 else
 EXTRA_DIST = \
 	man/upstart-udev-bridge.8
-
 endif
 
 

=== added file 'extra/conf/upstart-socket-bridge.conf'
--- extra/conf/upstart-socket-bridge.conf	1970-01-01 00:00:00 +0000
+++ extra/conf/upstart-socket-bridge.conf	2011-06-17 11:15:58 +0000
@@ -0,0 +1,16 @@
+# upstart-socket-bridge - Bridge socket events into upstart
+#
+# This helper daemon receives socket(7) events and
+# emits equivalent Upstart events.
+
+description	"Bridge socket events into upstart"
+
+emits socket
+
+start on net-device-up IFACE=lo
+stop on runlevel [!2345]
+
+expect daemon
+respawn
+
+exec upstart-socket-bridge --daemon

=== removed file 'extra/conf/upstart-socket-bridge.conf'
--- extra/conf/upstart-socket-bridge.conf	2011-05-25 19:25:11 +0000
+++ extra/conf/upstart-socket-bridge.conf	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# upstart-socket-bridge - Bridge socket events into upstart
-#
-# This helper daemon receives socket(7) events and
-# emits equivalent Upstart events.
-
-description	"Bridge socket events into upstart"
-
-emits socket
-
-start on net-device-up IFACE=lo
-stop on runlevel [!2345]
-
-expect daemon
-respawn
-
-exec upstart-socket-bridge --daemon

=== added file 'extra/man/socket-event.7'
--- extra/man/socket-event.7	1970-01-01 00:00:00 +0000
+++ extra/man/socket-event.7	2011-06-17 11:15:58 +0000
@@ -0,0 +1,92 @@
+.TH socket\-event 8 2011-03-08 upstart
+.\"
+.SH NAME
+socket \- event signalling that a socket connection has been made
+.\"
+.SH SYNOPSIS
+.B socket
+.BI PROTO\fR= PROTO
+.BI PORT\fR= PORT
+.BI ADDR\fR= ADDR
+
+.B socket
+.BI PROTO\fR= PROTO
+.BI PATH\fR= PATH
+.\"
+.SH DESCRIPTION
+
+The
+.B socket
+event is generated by the
+.BR upstart\-socket\-bridge (8)
+daemon when a socket connection is made whose details match the
+socket event condition and environment specified in a jobs
+.B start on
+or
+.B stop on
+stanza.
+
+When an incoming connection is detected, the file descriptor
+representing the socket is passed to the job in question to allow it to
+.BR accept (2)
+the connection. Additionally, the environment variable
+.B UPSTART_JOB
+will contain the name of the event ("socket") and the environment
+variable
+.B UPSTART_FDS
+will contain the number of the file descriptor corresponding to the
+listening socket.
+.\"
+.SH EXAMPLES
+.\"
+.SS Internet socket
+Start web server when first client connects from localhost:
+.RS
+.nf
+
+start on socket PROTO=inet PORT=80 ADDR=127.0.0.1
+.fi
+.RE
+.\"
+.SS Local socket
+.P
+.RS
+.nf
+
+start on socket PROTO=unix PATH=/var/run/.s.pgsql.1234
+.fi
+.FE
+.\"
+.SS Abstract socket
+.P
+
+.RS
+.nf
+
+start on socket PROTO=unix PATH=@/at/upstart/example
+.fi
+.FE
+.\"
+.SH AUTHOR
+Written by Scott James Remnant
+.RB < [e-mail] >
+
+Manual page written by James Hunt
+.RB < [e-mail] >
+.\"
+.SH BUGS
+Report bugs at 
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2011 Canonical Ltd.
+.PP
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.SH SEE ALSO
+.BR init (5)
+.BR init (8)
+.BR socket (2)
+.BR socket (7)
+.BR upstart\-socket\-bridge (8)

=== removed file 'extra/man/socket-event.7'
--- extra/man/socket-event.7	2011-05-25 19:25:11 +0000
+++ extra/man/socket-event.7	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-.TH socket\-event 8 2011-03-08 upstart
-.\"
-.SH NAME
-socket \- event signalling that a socket connection has been made
-.\"
-.SH SYNOPSIS
-.B socket
-.BI PROTO\fR= PROTO
-.BI PORT\fR= PORT
-.BI ADDR\fR= ADDR
-
-.B socket
-.BI PROTO\fR= PROTO
-.BI PATH\fR= PATH
-.\"
-.SH DESCRIPTION
-
-The
-.B socket
-event is generated by the
-.BR upstart\-socket\-bridge (8)
-daemon when a socket connection is made whose details match the
-socket event condition and environment specified in a jobs
-.B start on
-or
-.B stop on
-stanza.
-
-When an incoming connection is detected, the file descriptor
-representing the socket is passed to the job in question to allow it to
-.BR accept (2)
-the connection. Additionally, the environment variable
-.B UPSTART_JOB
-will contain the name of the event ("socket") and the environment
-variable
-.B UPSTART_FDS
-will contain the number of the file descriptor corresponding to the
-listening socket.
-.\"
-.SH EXAMPLES
-.\"
-.SS Internet socket
-Start web server when first client connects from localhost:
-.RS
-.nf
-
-start on socket PROTO=inet PORT=80 ADDR=127.0.0.1
-.fi
-.RE
-.\"
-.SS Local socket
-.P
-.RS
-.nf
-
-start on socket PROTO=unix PATH=/var/run/.s.pgsql.1234
-.fi
-.FE
-.\"
-.SS Abstract socket
-.P
-
-.RS
-.nf
-
-start on socket PROTO=unix PATH=@/at/upstart/example
-.fi
-.FE
-.\"
-.SH AUTHOR
-Written by Scott James Remnant
-.RB < [e-mail] >
-
-Manual page written by James Hunt
-.RB < [e-mail] >
-.\"
-.SH BUGS
-Report bugs at 
-.RB < https://launchpad.net/upstart/+bugs >
-.\"
-.SH COPYRIGHT
-Copyright \(co 2011 Canonical Ltd.
-.PP
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.SH SEE ALSO
-.BR init (5)
-.BR init (8)
-.BR socket (2)
-.BR socket (7)
-.BR upstart\-socket\-bridge (8)

=== added file 'extra/man/upstart-socket-bridge.8'
--- extra/man/upstart-socket-bridge.8	1970-01-01 00:00:00 +0000
+++ extra/man/upstart-socket-bridge.8	2011-06-17 11:15:58 +0000
@@ -0,0 +1,47 @@
+.TH upstart-socket-bridge 8 2011-03-08 upstart
+.\"
+.SH NAME
+upstart-socket-bridge \- Bridge between Upstart and sockets
+.\"
+.SH SYNOPSIS
+.B upstart-socket-bridge
+.RI [ OPTIONS ]...
+.\"
+.SH DESCRIPTION
+The
+.B upstart-socket-bridge
+queries the Upstart 
+.BR init (8)
+daemon for all job configurations which
+.B start on
+or
+.B stop on
+the socket event. It then waits for an incoming connection on each
+specified
+.BR socket (7)
+and when detected emits the socket event (\fBsocket\-event\fP (7)),
+setting a number of environment variables for the job to query.
+.\"
+.SH AUTHOR
+Written by Scott James Remnant
+.RB < [e-mail] >
+
+Manual page written by James Hunt
+.RB < [e-mail] >
+.\"
+.SH BUGS
+Report bugs at 
+.RB < https://launchpad.net/upstart/+bugs >
+.\"
+.SH COPYRIGHT
+Copyright \(co 2011 Canonical Ltd.
+.PP
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.SH SEE ALSO
+.BR init (5)
+.BR init (8)
+.BR socket (2)
+.BR socket (7)
+.BR socket\-event (7)

=== removed file 'extra/man/upstart-socket-bridge.8'
--- extra/man/upstart-socket-bridge.8	2011-05-25 19:25:11 +0000
+++ extra/man/upstart-socket-bridge.8	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-.TH upstart-socket-bridge 8 2011-03-08 upstart
-.\"
-.SH NAME
-upstart-socket-bridge \- Bridge between Upstart and sockets
-.\"
-.SH SYNOPSIS
-.B upstart-socket-bridge
-.RI [ OPTIONS ]...
-.\"
-.SH DESCRIPTION
-The
-.B upstart-socket-bridge
-queries the Upstart 
-.BR init (8)
-daemon for all job configurations which
-.B start on
-or
-.B stop on
-the socket event. It then waits for an incoming connection on each
-specified
-.BR socket (7)
-and when detected emits the socket event (\fBsocket\-event\fP (7)),
-setting a number of environment variables for the job to query.
-.\"
-.SH AUTHOR
-Written by Scott James Remnant
-.RB < [e-mail] >
-
-Manual page written by James Hunt
-.RB < [e-mail] >
-.\"
-.SH BUGS
-Report bugs at 
-.RB < https://launchpad.net/upstart/+bugs >
-.\"
-.SH COPYRIGHT
-Copyright \(co 2011 Canonical Ltd.
-.PP
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.SH SEE ALSO
-.BR init (5)
-.BR init (8)
-.BR socket (2)
-.BR socket (7)
-.BR socket\-event (7)

=== modified file 'extra/upstart-socket-bridge.c'
--- extra/upstart-socket-bridge.c	2011-05-25 19:25:11 +0000
+++ extra/upstart-socket-bridge.c	2011-06-17 11:15:58 +0000
@@ -478,7 +478,7 @@
 	nih_assert (! strcmp(socket_info[0], "socket"));
 
 	sock = NIH_MUST (nih_new (job, Socket));
-	memset (sock, 0, sizeof sock);
+	memset (sock, 0, sizeof (Socket));
 	sock->sock = -1;
 
 	nih_list_init (&sock->entry);

=== modified file 'init/Makefile.am'
--- init/Makefile.am	2011-05-25 19:25:11 +0000
+++ init/Makefile.am	2011-06-17 11:15:58 +0000
@@ -145,19 +145,16 @@
 tests: $(BUILT_SOURCES) $(check_PROGRAMS)
 
 test_system_SOURCES = tests/test_system.c
-test_system_CFLAGS = $(AM_CFLAGS) -DTEST
 test_system_LDADD = \
 	system.o \
 	$(NIH_LIBS)
 
 test_environ_SOURCES = tests/test_environ.c
-test_environ_CFLAGS = $(AM_CFLAGS) -DTEST
 test_environ_LDADD = \
 	environ.o \
 	$(NIH_LIBS)
 
 test_process_SOURCES = tests/test_process.c
-test_process_CFLAGS = $(AM_CFLAGS) -DTEST
 test_process_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -170,7 +167,6 @@
 	$(DBUS_LIBS)
 
 test_job_class_SOURCES = tests/test_job_class.c
-test_job_class_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_class_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -183,7 +179,6 @@
 	$(DBUS_LIBS)
 
 test_job_process_SOURCES = tests/test_job_process.c
-test_job_process_CFLAGS = $(AM_CFLAGS) -DTEST
 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 \
@@ -196,7 +191,6 @@
 	$(DBUS_LIBS)
 
 test_job_SOURCES = tests/test_job.c
-test_job_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -209,7 +203,6 @@
 	$(DBUS_LIBS)
 
 test_event_SOURCES = tests/test_event.c
-test_event_CFLAGS = $(AM_CFLAGS) -DTEST
 test_event_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -222,7 +215,6 @@
 	$(DBUS_LIBS)
 
 test_event_operator_SOURCES = tests/test_event_operator.c
-test_event_operator_CFLAGS = $(AM_CFLAGS) -DTEST
 test_event_operator_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -235,7 +227,6 @@
 	$(DBUS_LIBS)
 
 test_blocked_SOURCES = tests/test_blocked.c
-test_blocked_CFLAGS = $(AM_CFLAGS) -DTEST
 test_blocked_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -248,7 +239,6 @@
 	$(DBUS_LIBS)
 
 test_parse_job_SOURCES = tests/test_parse_job.c
-test_parse_job_CFLAGS = $(AM_CFLAGS) -DTEST
 test_parse_job_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -261,7 +251,6 @@
 	$(DBUS_LIBS)
 
 test_parse_conf_SOURCES = tests/test_parse_conf.c
-test_parse_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_parse_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -274,7 +263,6 @@
 	$(DBUS_LIBS)
 
 test_conf_SOURCES = tests/test_conf.c
-test_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -287,7 +275,6 @@
 	$(DBUS_LIBS)
 
 test_control_SOURCES = tests/test_control.c
-test_control_CFLAGS = $(AM_CFLAGS) -DTEST
 test_control_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \

=== modified file 'init/Makefile.in'
--- init/Makefile.in	2011-05-25 19:25:11 +0000
+++ init/Makefile.in	2011-06-17 11:15:58 +0000
@@ -99,7 +99,7 @@
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am_test_blocked_OBJECTS = test_blocked-test_blocked.$(OBJEXT)
+am_test_blocked_OBJECTS = test_blocked.$(OBJEXT)
 test_blocked_OBJECTS = $(am_test_blocked_OBJECTS)
 test_blocked_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -107,10 +107,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_blocked_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_blocked_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_conf_OBJECTS = test_conf-test_conf.$(OBJEXT)
+am_test_conf_OBJECTS = test_conf.$(OBJEXT)
 test_conf_OBJECTS = $(am_test_conf_OBJECTS)
 test_conf_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -118,10 +115,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_conf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_conf_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_control_OBJECTS = test_control-test_control.$(OBJEXT)
+am_test_control_OBJECTS = test_control.$(OBJEXT)
 test_control_OBJECTS = $(am_test_control_OBJECTS)
 test_control_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -129,16 +123,10 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_control_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_control_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_environ_OBJECTS = test_environ-test_environ.$(OBJEXT)
+am_test_environ_OBJECTS = test_environ.$(OBJEXT)
 test_environ_OBJECTS = $(am_test_environ_OBJECTS)
 test_environ_DEPENDENCIES = environ.o $(am__DEPENDENCIES_1)
-test_environ_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_environ_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_event_OBJECTS = test_event-test_event.$(OBJEXT)
+am_test_event_OBJECTS = test_event.$(OBJEXT)
 test_event_OBJECTS = $(am_test_event_OBJECTS)
 test_event_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -146,11 +134,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_event_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_event_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_event_operator_OBJECTS =  \
-	test_event_operator-test_event_operator.$(OBJEXT)
+am_test_event_operator_OBJECTS = test_event_operator.$(OBJEXT)
 test_event_operator_OBJECTS = $(am_test_event_operator_OBJECTS)
 test_event_operator_DEPENDENCIES = system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o \
@@ -158,11 +142,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_event_operator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_event_operator_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_test_job_OBJECTS = test_job-test_job.$(OBJEXT)
+am_test_job_OBJECTS = test_job.$(OBJEXT)
 test_job_OBJECTS = $(am_test_job_OBJECTS)
 test_job_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -170,10 +150,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_job_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_job_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_job_class_OBJECTS = test_job_class-test_job_class.$(OBJEXT)
+am_test_job_class_OBJECTS = test_job_class.$(OBJEXT)
 test_job_class_OBJECTS = $(am_test_job_class_OBJECTS)
 test_job_class_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -181,12 +158,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_job_class_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_job_class_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_test_job_process_OBJECTS =  \
-	test_job_process-test_job_process.$(OBJEXT)
+am_test_job_process_OBJECTS = test_job_process.$(OBJEXT)
 test_job_process_OBJECTS = $(am_test_job_process_OBJECTS)
 test_job_process_DEPENDENCIES = system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o \
@@ -194,12 +166,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_job_process_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_job_process_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_test_parse_conf_OBJECTS =  \
-	test_parse_conf-test_parse_conf.$(OBJEXT)
+am_test_parse_conf_OBJECTS = test_parse_conf.$(OBJEXT)
 test_parse_conf_OBJECTS = $(am_test_parse_conf_OBJECTS)
 test_parse_conf_DEPENDENCIES = system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o \
@@ -207,11 +174,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_parse_conf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_parse_conf_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-am_test_parse_job_OBJECTS = test_parse_job-test_parse_job.$(OBJEXT)
+am_test_parse_job_OBJECTS = test_parse_job.$(OBJEXT)
 test_parse_job_OBJECTS = $(am_test_parse_job_OBJECTS)
 test_parse_job_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -219,11 +182,7 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_parse_job_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_parse_job_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_test_process_OBJECTS = test_process-test_process.$(OBJEXT)
+am_test_process_OBJECTS = test_process.$(OBJEXT)
 test_process_OBJECTS = $(am_test_process_OBJECTS)
 test_process_DEPENDENCIES = system.o environ.o process.o job_class.o \
 	job_process.o job.o event.o event_operator.o blocked.o \
@@ -231,15 +190,9 @@
 	com.ubuntu.Upstart.o com.ubuntu.Upstart.Job.o \
 	com.ubuntu.Upstart.Instance.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-test_process_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_process_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_system_OBJECTS = test_system-test_system.$(OBJEXT)
+am_test_system_OBJECTS = test_system.$(OBJEXT)
 test_system_OBJECTS = $(am_test_system_OBJECTS)
 test_system_DEPENDENCIES = system.o $(am__DEPENDENCIES_1)
-test_system_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_system_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -594,19 +547,16 @@
 
 EXTRA_DIST = init.supp
 test_system_SOURCES = tests/test_system.c
-test_system_CFLAGS = $(AM_CFLAGS) -DTEST
 test_system_LDADD = \
 	system.o \
 	$(NIH_LIBS)
 
 test_environ_SOURCES = tests/test_environ.c
-test_environ_CFLAGS = $(AM_CFLAGS) -DTEST
 test_environ_LDADD = \
 	environ.o \
 	$(NIH_LIBS)
 
 test_process_SOURCES = tests/test_process.c
-test_process_CFLAGS = $(AM_CFLAGS) -DTEST
 test_process_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -619,7 +569,6 @@
 	$(DBUS_LIBS)
 
 test_job_class_SOURCES = tests/test_job_class.c
-test_job_class_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_class_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -632,7 +581,6 @@
 	$(DBUS_LIBS)
 
 test_job_process_SOURCES = tests/test_job_process.c
-test_job_process_CFLAGS = $(AM_CFLAGS) -DTEST
 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 \
@@ -645,7 +593,6 @@
 	$(DBUS_LIBS)
 
 test_job_SOURCES = tests/test_job.c
-test_job_CFLAGS = $(AM_CFLAGS) -DTEST
 test_job_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -658,7 +605,6 @@
 	$(DBUS_LIBS)
 
 test_event_SOURCES = tests/test_event.c
-test_event_CFLAGS = $(AM_CFLAGS) -DTEST
 test_event_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -671,7 +617,6 @@
 	$(DBUS_LIBS)
 
 test_event_operator_SOURCES = tests/test_event_operator.c
-test_event_operator_CFLAGS = $(AM_CFLAGS) -DTEST
 test_event_operator_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -684,7 +629,6 @@
 	$(DBUS_LIBS)
 
 test_blocked_SOURCES = tests/test_blocked.c
-test_blocked_CFLAGS = $(AM_CFLAGS) -DTEST
 test_blocked_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -697,7 +641,6 @@
 	$(DBUS_LIBS)
 
 test_parse_job_SOURCES = tests/test_parse_job.c
-test_parse_job_CFLAGS = $(AM_CFLAGS) -DTEST
 test_parse_job_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -710,7 +653,6 @@
 	$(DBUS_LIBS)
 
 test_parse_conf_SOURCES = tests/test_parse_conf.c
-test_parse_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_parse_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -723,7 +665,6 @@
 	$(DBUS_LIBS)
 
 test_conf_SOURCES = tests/test_conf.c
-test_conf_CFLAGS = $(AM_CFLAGS) -DTEST
 test_conf_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -736,7 +677,6 @@
 	$(DBUS_LIBS)
 
 test_control_SOURCES = tests/test_control.c
-test_control_CFLAGS = $(AM_CFLAGS) -DTEST
 test_control_LDADD = \
 	system.o environ.o process.o \
 	job_class.o job_process.o job.o event.o event_operator.o blocked.o \
@@ -840,43 +780,43 @@
 	$(AM_V_CCLD)$(LINK) $(init_OBJECTS) $(init_LDADD) $(LIBS)
 test_blocked$(EXEEXT): $(test_blocked_OBJECTS) $(test_blocked_DEPENDENCIES) 
 	@rm -f test_blocked$(EXEEXT)
-	$(AM_V_CCLD)$(test_blocked_LINK) $(test_blocked_OBJECTS) $(test_blocked_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_blocked_OBJECTS) $(test_blocked_LDADD) $(LIBS)
 test_conf$(EXEEXT): $(test_conf_OBJECTS) $(test_conf_DEPENDENCIES) 
 	@rm -f test_conf$(EXEEXT)
-	$(AM_V_CCLD)$(test_conf_LINK) $(test_conf_OBJECTS) $(test_conf_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_conf_OBJECTS) $(test_conf_LDADD) $(LIBS)
 test_control$(EXEEXT): $(test_control_OBJECTS) $(test_control_DEPENDENCIES) 
 	@rm -f test_control$(EXEEXT)
-	$(AM_V_CCLD)$(test_control_LINK) $(test_control_OBJECTS) $(test_control_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_control_OBJECTS) $(test_control_LDADD) $(LIBS)
 test_environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) 
 	@rm -f test_environ$(EXEEXT)
-	$(AM_V_CCLD)$(test_environ_LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
 test_event$(EXEEXT): $(test_event_OBJECTS) $(test_event_DEPENDENCIES) 
 	@rm -f test_event$(EXEEXT)
-	$(AM_V_CCLD)$(test_event_LINK) $(test_event_OBJECTS) $(test_event_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_event_OBJECTS) $(test_event_LDADD) $(LIBS)
 test_event_operator$(EXEEXT): $(test_event_operator_OBJECTS) $(test_event_operator_DEPENDENCIES) 
 	@rm -f test_event_operator$(EXEEXT)
-	$(AM_V_CCLD)$(test_event_operator_LINK) $(test_event_operator_OBJECTS) $(test_event_operator_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_event_operator_OBJECTS) $(test_event_operator_LDADD) $(LIBS)
 test_job$(EXEEXT): $(test_job_OBJECTS) $(test_job_DEPENDENCIES) 
 	@rm -f test_job$(EXEEXT)
-	$(AM_V_CCLD)$(test_job_LINK) $(test_job_OBJECTS) $(test_job_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_job_OBJECTS) $(test_job_LDADD) $(LIBS)
 test_job_class$(EXEEXT): $(test_job_class_OBJECTS) $(test_job_class_DEPENDENCIES) 
 	@rm -f test_job_class$(EXEEXT)
-	$(AM_V_CCLD)$(test_job_class_LINK) $(test_job_class_OBJECTS) $(test_job_class_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_job_class_OBJECTS) $(test_job_class_LDADD) $(LIBS)
 test_job_process$(EXEEXT): $(test_job_process_OBJECTS) $(test_job_process_DEPENDENCIES) 
 	@rm -f test_job_process$(EXEEXT)
-	$(AM_V_CCLD)$(test_job_process_LINK) $(test_job_process_OBJECTS) $(test_job_process_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_job_process_OBJECTS) $(test_job_process_LDADD) $(LIBS)
 test_parse_conf$(EXEEXT): $(test_parse_conf_OBJECTS) $(test_parse_conf_DEPENDENCIES) 
 	@rm -f test_parse_conf$(EXEEXT)
-	$(AM_V_CCLD)$(test_parse_conf_LINK) $(test_parse_conf_OBJECTS) $(test_parse_conf_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_parse_conf_OBJECTS) $(test_parse_conf_LDADD) $(LIBS)
 test_parse_job$(EXEEXT): $(test_parse_job_OBJECTS) $(test_parse_job_DEPENDENCIES) 
 	@rm -f test_parse_job$(EXEEXT)
-	$(AM_V_CCLD)$(test_parse_job_LINK) $(test_parse_job_OBJECTS) $(test_parse_job_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_parse_job_OBJECTS) $(test_parse_job_LDADD) $(LIBS)
 test_process$(EXEEXT): $(test_process_OBJECTS) $(test_process_DEPENDENCIES) 
 	@rm -f test_process$(EXEEXT)
-	$(AM_V_CCLD)$(test_process_LINK) $(test_process_OBJECTS) $(test_process_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_process_OBJECTS) $(test_process_LDADD) $(LIBS)
 test_system$(EXEEXT): $(test_system_OBJECTS) $(test_system_DEPENDENCIES) 
 	@rm -f test_system$(EXEEXT)
-	$(AM_V_CCLD)$(test_system_LINK) $(test_system_OBJECTS) $(test_system_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(test_system_OBJECTS) $(test_system_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -902,19 +842,19 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/system.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_blocked-test_blocked.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conf-test_conf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_control-test_control.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_environ-test_environ.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_event-test_event.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_event_operator-test_event_operator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job-test_job.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job_class-test_job_class.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job_process-test_job_process.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_parse_conf-test_parse_conf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_parse_job-test_parse_job.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process-test_process.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_system-test_system.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_blocked.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_control.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_environ.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_event.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_event_operator.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job_class.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_job_process.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_parse_conf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_parse_job.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_system.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -940,213 +880,213 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-test_blocked-test_blocked.o: tests/test_blocked.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_blocked_CFLAGS) $(CFLAGS) -MT test_blocked-test_blocked.o -MD -MP -MF $(DEPDIR)/test_blocked-test_blocked.Tpo -c -o test_blocked-test_blocked.o `test -f 'tests/test_blocked.c' || echo '$(srcdir)/'`tests/test_blocked.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_blocked-test_blocked.Tpo $(DEPDIR)/test_blocked-test_blocked.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_blocked.c' object='test_blocked-test_blocked.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_blocked_CFLAGS) $(CFLAGS) -c -o test_blocked-test_blocked.o `test -f 'tests/test_blocked.c' || echo '$(srcdir)/'`tests/test_blocked.c
-
-test_blocked-test_blocked.obj: tests/test_blocked.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_blocked_CFLAGS) $(CFLAGS) -MT test_blocked-test_blocked.obj -MD -MP -MF $(DEPDIR)/test_blocked-test_blocked.Tpo -c -o test_blocked-test_blocked.obj `if test -f 'tests/test_blocked.c'; then $(CYGPATH_W) 'tests/test_blocked.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_blocked.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_blocked-test_blocked.Tpo $(DEPDIR)/test_blocked-test_blocked.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_blocked.c' object='test_blocked-test_blocked.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_blocked_CFLAGS) $(CFLAGS) -c -o test_blocked-test_blocked.obj `if test -f 'tests/test_blocked.c'; then $(CYGPATH_W) 'tests/test_blocked.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_blocked.c'; fi`
-
-test_conf-test_conf.o: tests/test_conf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -MT test_conf-test_conf.o -MD -MP -MF $(DEPDIR)/test_conf-test_conf.Tpo -c -o test_conf-test_conf.o `test -f 'tests/test_conf.c' || echo '$(srcdir)/'`tests/test_conf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_conf-test_conf.Tpo $(DEPDIR)/test_conf-test_conf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_conf.c' object='test_conf-test_conf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -c -o test_conf-test_conf.o `test -f 'tests/test_conf.c' || echo '$(srcdir)/'`tests/test_conf.c
-
-test_conf-test_conf.obj: tests/test_conf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -MT test_conf-test_conf.obj -MD -MP -MF $(DEPDIR)/test_conf-test_conf.Tpo -c -o test_conf-test_conf.obj `if test -f 'tests/test_conf.c'; then $(CYGPATH_W) 'tests/test_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_conf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_conf-test_conf.Tpo $(DEPDIR)/test_conf-test_conf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_conf.c' object='test_conf-test_conf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conf_CFLAGS) $(CFLAGS) -c -o test_conf-test_conf.obj `if test -f 'tests/test_conf.c'; then $(CYGPATH_W) 'tests/test_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_conf.c'; fi`
-
-test_control-test_control.o: tests/test_control.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_control_CFLAGS) $(CFLAGS) -MT test_control-test_control.o -MD -MP -MF $(DEPDIR)/test_control-test_control.Tpo -c -o test_control-test_control.o `test -f 'tests/test_control.c' || echo '$(srcdir)/'`tests/test_control.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_control-test_control.Tpo $(DEPDIR)/test_control-test_control.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_control.c' object='test_control-test_control.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_control_CFLAGS) $(CFLAGS) -c -o test_control-test_control.o `test -f 'tests/test_control.c' || echo '$(srcdir)/'`tests/test_control.c
-
-test_control-test_control.obj: tests/test_control.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_control_CFLAGS) $(CFLAGS) -MT test_control-test_control.obj -MD -MP -MF $(DEPDIR)/test_control-test_control.Tpo -c -o test_control-test_control.obj `if test -f 'tests/test_control.c'; then $(CYGPATH_W) 'tests/test_control.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_control.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_control-test_control.Tpo $(DEPDIR)/test_control-test_control.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_control.c' object='test_control-test_control.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_control_CFLAGS) $(CFLAGS) -c -o test_control-test_control.obj `if test -f 'tests/test_control.c'; then $(CYGPATH_W) 'tests/test_control.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_control.c'; fi`
-
-test_environ-test_environ.o: tests/test_environ.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_environ_CFLAGS) $(CFLAGS) -MT test_environ-test_environ.o -MD -MP -MF $(DEPDIR)/test_environ-test_environ.Tpo -c -o test_environ-test_environ.o `test -f 'tests/test_environ.c' || echo '$(srcdir)/'`tests/test_environ.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_environ-test_environ.Tpo $(DEPDIR)/test_environ-test_environ.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_environ.c' object='test_environ-test_environ.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_environ_CFLAGS) $(CFLAGS) -c -o test_environ-test_environ.o `test -f 'tests/test_environ.c' || echo '$(srcdir)/'`tests/test_environ.c
-
-test_environ-test_environ.obj: tests/test_environ.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_environ_CFLAGS) $(CFLAGS) -MT test_environ-test_environ.obj -MD -MP -MF $(DEPDIR)/test_environ-test_environ.Tpo -c -o test_environ-test_environ.obj `if test -f 'tests/test_environ.c'; then $(CYGPATH_W) 'tests/test_environ.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_environ.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_environ-test_environ.Tpo $(DEPDIR)/test_environ-test_environ.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_environ.c' object='test_environ-test_environ.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_environ_CFLAGS) $(CFLAGS) -c -o test_environ-test_environ.obj `if test -f 'tests/test_environ.c'; then $(CYGPATH_W) 'tests/test_environ.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_environ.c'; fi`
-
-test_event-test_event.o: tests/test_event.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_CFLAGS) $(CFLAGS) -MT test_event-test_event.o -MD -MP -MF $(DEPDIR)/test_event-test_event.Tpo -c -o test_event-test_event.o `test -f 'tests/test_event.c' || echo '$(srcdir)/'`tests/test_event.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event-test_event.Tpo $(DEPDIR)/test_event-test_event.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event.c' object='test_event-test_event.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_CFLAGS) $(CFLAGS) -c -o test_event-test_event.o `test -f 'tests/test_event.c' || echo '$(srcdir)/'`tests/test_event.c
-
-test_event-test_event.obj: tests/test_event.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_CFLAGS) $(CFLAGS) -MT test_event-test_event.obj -MD -MP -MF $(DEPDIR)/test_event-test_event.Tpo -c -o test_event-test_event.obj `if test -f 'tests/test_event.c'; then $(CYGPATH_W) 'tests/test_event.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event-test_event.Tpo $(DEPDIR)/test_event-test_event.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event.c' object='test_event-test_event.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_CFLAGS) $(CFLAGS) -c -o test_event-test_event.obj `if test -f 'tests/test_event.c'; then $(CYGPATH_W) 'tests/test_event.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event.c'; fi`
-
-test_event_operator-test_event_operator.o: tests/test_event_operator.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_operator_CFLAGS) $(CFLAGS) -MT test_event_operator-test_event_operator.o -MD -MP -MF $(DEPDIR)/test_event_operator-test_event_operator.Tpo -c -o test_event_operator-test_event_operator.o `test -f 'tests/test_event_operator.c' || echo '$(srcdir)/'`tests/test_event_operator.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event_operator-test_event_operator.Tpo $(DEPDIR)/test_event_operator-test_event_operator.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event_operator.c' object='test_event_operator-test_event_operator.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_operator_CFLAGS) $(CFLAGS) -c -o test_event_operator-test_event_operator.o `test -f 'tests/test_event_operator.c' || echo '$(srcdir)/'`tests/test_event_operator.c
-
-test_event_operator-test_event_operator.obj: tests/test_event_operator.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_operator_CFLAGS) $(CFLAGS) -MT test_event_operator-test_event_operator.obj -MD -MP -MF $(DEPDIR)/test_event_operator-test_event_operator.Tpo -c -o test_event_operator-test_event_operator.obj `if test -f 'tests/test_event_operator.c'; then $(CYGPATH_W) 'tests/test_event_operator.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event_operator.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event_operator-test_event_operator.Tpo $(DEPDIR)/test_event_operator-test_event_operator.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event_operator.c' object='test_event_operator-test_event_operator.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_event_operator_CFLAGS) $(CFLAGS) -c -o test_event_operator-test_event_operator.obj `if test -f 'tests/test_event_operator.c'; then $(CYGPATH_W) 'tests/test_event_operator.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event_operator.c'; fi`
-
-test_job-test_job.o: tests/test_job.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_CFLAGS) $(CFLAGS) -MT test_job-test_job.o -MD -MP -MF $(DEPDIR)/test_job-test_job.Tpo -c -o test_job-test_job.o `test -f 'tests/test_job.c' || echo '$(srcdir)/'`tests/test_job.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job-test_job.Tpo $(DEPDIR)/test_job-test_job.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job.c' object='test_job-test_job.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_CFLAGS) $(CFLAGS) -c -o test_job-test_job.o `test -f 'tests/test_job.c' || echo '$(srcdir)/'`tests/test_job.c
-
-test_job-test_job.obj: tests/test_job.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_CFLAGS) $(CFLAGS) -MT test_job-test_job.obj -MD -MP -MF $(DEPDIR)/test_job-test_job.Tpo -c -o test_job-test_job.obj `if test -f 'tests/test_job.c'; then $(CYGPATH_W) 'tests/test_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job-test_job.Tpo $(DEPDIR)/test_job-test_job.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job.c' object='test_job-test_job.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_CFLAGS) $(CFLAGS) -c -o test_job-test_job.obj `if test -f 'tests/test_job.c'; then $(CYGPATH_W) 'tests/test_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job.c'; fi`
-
-test_job_class-test_job_class.o: tests/test_job_class.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_class_CFLAGS) $(CFLAGS) -MT test_job_class-test_job_class.o -MD -MP -MF $(DEPDIR)/test_job_class-test_job_class.Tpo -c -o test_job_class-test_job_class.o `test -f 'tests/test_job_class.c' || echo '$(srcdir)/'`tests/test_job_class.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_class-test_job_class.Tpo $(DEPDIR)/test_job_class-test_job_class.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_class.c' object='test_job_class-test_job_class.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_class_CFLAGS) $(CFLAGS) -c -o test_job_class-test_job_class.o `test -f 'tests/test_job_class.c' || echo '$(srcdir)/'`tests/test_job_class.c
-
-test_job_class-test_job_class.obj: tests/test_job_class.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_class_CFLAGS) $(CFLAGS) -MT test_job_class-test_job_class.obj -MD -MP -MF $(DEPDIR)/test_job_class-test_job_class.Tpo -c -o test_job_class-test_job_class.obj `if test -f 'tests/test_job_class.c'; then $(CYGPATH_W) 'tests/test_job_class.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_class.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_class-test_job_class.Tpo $(DEPDIR)/test_job_class-test_job_class.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_class.c' object='test_job_class-test_job_class.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_class_CFLAGS) $(CFLAGS) -c -o test_job_class-test_job_class.obj `if test -f 'tests/test_job_class.c'; then $(CYGPATH_W) 'tests/test_job_class.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_class.c'; fi`
-
-test_job_process-test_job_process.o: tests/test_job_process.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_process_CFLAGS) $(CFLAGS) -MT test_job_process-test_job_process.o -MD -MP -MF $(DEPDIR)/test_job_process-test_job_process.Tpo -c -o test_job_process-test_job_process.o `test -f 'tests/test_job_process.c' || echo '$(srcdir)/'`tests/test_job_process.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_process-test_job_process.Tpo $(DEPDIR)/test_job_process-test_job_process.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_process.c' object='test_job_process-test_job_process.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_process_CFLAGS) $(CFLAGS) -c -o test_job_process-test_job_process.o `test -f 'tests/test_job_process.c' || echo '$(srcdir)/'`tests/test_job_process.c
-
-test_job_process-test_job_process.obj: tests/test_job_process.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_process_CFLAGS) $(CFLAGS) -MT test_job_process-test_job_process.obj -MD -MP -MF $(DEPDIR)/test_job_process-test_job_process.Tpo -c -o test_job_process-test_job_process.obj `if test -f 'tests/test_job_process.c'; then $(CYGPATH_W) 'tests/test_job_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_process.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_process-test_job_process.Tpo $(DEPDIR)/test_job_process-test_job_process.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_process.c' object='test_job_process-test_job_process.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_process_CFLAGS) $(CFLAGS) -c -o test_job_process-test_job_process.obj `if test -f 'tests/test_job_process.c'; then $(CYGPATH_W) 'tests/test_job_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_process.c'; fi`
-
-test_parse_conf-test_parse_conf.o: tests/test_parse_conf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_conf_CFLAGS) $(CFLAGS) -MT test_parse_conf-test_parse_conf.o -MD -MP -MF $(DEPDIR)/test_parse_conf-test_parse_conf.Tpo -c -o test_parse_conf-test_parse_conf.o `test -f 'tests/test_parse_conf.c' || echo '$(srcdir)/'`tests/test_parse_conf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_conf-test_parse_conf.Tpo $(DEPDIR)/test_parse_conf-test_parse_conf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_conf.c' object='test_parse_conf-test_parse_conf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_conf_CFLAGS) $(CFLAGS) -c -o test_parse_conf-test_parse_conf.o `test -f 'tests/test_parse_conf.c' || echo '$(srcdir)/'`tests/test_parse_conf.c
-
-test_parse_conf-test_parse_conf.obj: tests/test_parse_conf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_conf_CFLAGS) $(CFLAGS) -MT test_parse_conf-test_parse_conf.obj -MD -MP -MF $(DEPDIR)/test_parse_conf-test_parse_conf.Tpo -c -o test_parse_conf-test_parse_conf.obj `if test -f 'tests/test_parse_conf.c'; then $(CYGPATH_W) 'tests/test_parse_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_conf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_conf-test_parse_conf.Tpo $(DEPDIR)/test_parse_conf-test_parse_conf.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_conf.c' object='test_parse_conf-test_parse_conf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_conf_CFLAGS) $(CFLAGS) -c -o test_parse_conf-test_parse_conf.obj `if test -f 'tests/test_parse_conf.c'; then $(CYGPATH_W) 'tests/test_parse_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_conf.c'; fi`
-
-test_parse_job-test_parse_job.o: tests/test_parse_job.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_job_CFLAGS) $(CFLAGS) -MT test_parse_job-test_parse_job.o -MD -MP -MF $(DEPDIR)/test_parse_job-test_parse_job.Tpo -c -o test_parse_job-test_parse_job.o `test -f 'tests/test_parse_job.c' || echo '$(srcdir)/'`tests/test_parse_job.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_job-test_parse_job.Tpo $(DEPDIR)/test_parse_job-test_parse_job.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_job.c' object='test_parse_job-test_parse_job.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_job_CFLAGS) $(CFLAGS) -c -o test_parse_job-test_parse_job.o `test -f 'tests/test_parse_job.c' || echo '$(srcdir)/'`tests/test_parse_job.c
-
-test_parse_job-test_parse_job.obj: tests/test_parse_job.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_job_CFLAGS) $(CFLAGS) -MT test_parse_job-test_parse_job.obj -MD -MP -MF $(DEPDIR)/test_parse_job-test_parse_job.Tpo -c -o test_parse_job-test_parse_job.obj `if test -f 'tests/test_parse_job.c'; then $(CYGPATH_W) 'tests/test_parse_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_job.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_job-test_parse_job.Tpo $(DEPDIR)/test_parse_job-test_parse_job.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_job.c' object='test_parse_job-test_parse_job.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_parse_job_CFLAGS) $(CFLAGS) -c -o test_parse_job-test_parse_job.obj `if test -f 'tests/test_parse_job.c'; then $(CYGPATH_W) 'tests/test_parse_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_job.c'; fi`
-
-test_process-test_process.o: tests/test_process.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_CFLAGS) $(CFLAGS) -MT test_process-test_process.o -MD -MP -MF $(DEPDIR)/test_process-test_process.Tpo -c -o test_process-test_process.o `test -f 'tests/test_process.c' || echo '$(srcdir)/'`tests/test_process.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_process-test_process.Tpo $(DEPDIR)/test_process-test_process.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_process.c' object='test_process-test_process.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_CFLAGS) $(CFLAGS) -c -o test_process-test_process.o `test -f 'tests/test_process.c' || echo '$(srcdir)/'`tests/test_process.c
-
-test_process-test_process.obj: tests/test_process.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_CFLAGS) $(CFLAGS) -MT test_process-test_process.obj -MD -MP -MF $(DEPDIR)/test_process-test_process.Tpo -c -o test_process-test_process.obj `if test -f 'tests/test_process.c'; then $(CYGPATH_W) 'tests/test_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_process.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_process-test_process.Tpo $(DEPDIR)/test_process-test_process.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_process.c' object='test_process-test_process.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_CFLAGS) $(CFLAGS) -c -o test_process-test_process.obj `if test -f 'tests/test_process.c'; then $(CYGPATH_W) 'tests/test_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_process.c'; fi`
-
-test_system-test_system.o: tests/test_system.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_CFLAGS) $(CFLAGS) -MT test_system-test_system.o -MD -MP -MF $(DEPDIR)/test_system-test_system.Tpo -c -o test_system-test_system.o `test -f 'tests/test_system.c' || echo '$(srcdir)/'`tests/test_system.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_system-test_system.Tpo $(DEPDIR)/test_system-test_system.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_system.c' object='test_system-test_system.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_CFLAGS) $(CFLAGS) -c -o test_system-test_system.o `test -f 'tests/test_system.c' || echo '$(srcdir)/'`tests/test_system.c
-
-test_system-test_system.obj: tests/test_system.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_CFLAGS) $(CFLAGS) -MT test_system-test_system.obj -MD -MP -MF $(DEPDIR)/test_system-test_system.Tpo -c -o test_system-test_system.obj `if test -f 'tests/test_system.c'; then $(CYGPATH_W) 'tests/test_system.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_system.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_system-test_system.Tpo $(DEPDIR)/test_system-test_system.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_system.c' object='test_system-test_system.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_CFLAGS) $(CFLAGS) -c -o test_system-test_system.obj `if test -f 'tests/test_system.c'; then $(CYGPATH_W) 'tests/test_system.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_system.c'; fi`
+test_blocked.o: tests/test_blocked.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_blocked.o -MD -MP -MF $(DEPDIR)/test_blocked.Tpo -c -o test_blocked.o `test -f 'tests/test_blocked.c' || echo '$(srcdir)/'`tests/test_blocked.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_blocked.Tpo $(DEPDIR)/test_blocked.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_blocked.c' object='test_blocked.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_blocked.o `test -f 'tests/test_blocked.c' || echo '$(srcdir)/'`tests/test_blocked.c
+
+test_blocked.obj: tests/test_blocked.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_blocked.obj -MD -MP -MF $(DEPDIR)/test_blocked.Tpo -c -o test_blocked.obj `if test -f 'tests/test_blocked.c'; then $(CYGPATH_W) 'tests/test_blocked.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_blocked.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_blocked.Tpo $(DEPDIR)/test_blocked.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_blocked.c' object='test_blocked.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_blocked.obj `if test -f 'tests/test_blocked.c'; then $(CYGPATH_W) 'tests/test_blocked.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_blocked.c'; fi`
+
+test_conf.o: tests/test_conf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_conf.o -MD -MP -MF $(DEPDIR)/test_conf.Tpo -c -o test_conf.o `test -f 'tests/test_conf.c' || echo '$(srcdir)/'`tests/test_conf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_conf.Tpo $(DEPDIR)/test_conf.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_conf.c' object='test_conf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_conf.o `test -f 'tests/test_conf.c' || echo '$(srcdir)/'`tests/test_conf.c
+
+test_conf.obj: tests/test_conf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_conf.obj -MD -MP -MF $(DEPDIR)/test_conf.Tpo -c -o test_conf.obj `if test -f 'tests/test_conf.c'; then $(CYGPATH_W) 'tests/test_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_conf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_conf.Tpo $(DEPDIR)/test_conf.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_conf.c' object='test_conf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_conf.obj `if test -f 'tests/test_conf.c'; then $(CYGPATH_W) 'tests/test_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_conf.c'; fi`
+
+test_control.o: tests/test_control.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_control.o -MD -MP -MF $(DEPDIR)/test_control.Tpo -c -o test_control.o `test -f 'tests/test_control.c' || echo '$(srcdir)/'`tests/test_control.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_control.Tpo $(DEPDIR)/test_control.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_control.c' object='test_control.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_control.o `test -f 'tests/test_control.c' || echo '$(srcdir)/'`tests/test_control.c
+
+test_control.obj: tests/test_control.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_control.obj -MD -MP -MF $(DEPDIR)/test_control.Tpo -c -o test_control.obj `if test -f 'tests/test_control.c'; then $(CYGPATH_W) 'tests/test_control.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_control.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_control.Tpo $(DEPDIR)/test_control.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_control.c' object='test_control.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_control.obj `if test -f 'tests/test_control.c'; then $(CYGPATH_W) 'tests/test_control.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_control.c'; fi`
+
+test_environ.o: tests/test_environ.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_environ.o -MD -MP -MF $(DEPDIR)/test_environ.Tpo -c -o test_environ.o `test -f 'tests/test_environ.c' || echo '$(srcdir)/'`tests/test_environ.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_environ.Tpo $(DEPDIR)/test_environ.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_environ.c' object='test_environ.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_environ.o `test -f 'tests/test_environ.c' || echo '$(srcdir)/'`tests/test_environ.c
+
+test_environ.obj: tests/test_environ.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_environ.obj -MD -MP -MF $(DEPDIR)/test_environ.Tpo -c -o test_environ.obj `if test -f 'tests/test_environ.c'; then $(CYGPATH_W) 'tests/test_environ.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_environ.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_environ.Tpo $(DEPDIR)/test_environ.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_environ.c' object='test_environ.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_environ.obj `if test -f 'tests/test_environ.c'; then $(CYGPATH_W) 'tests/test_environ.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_environ.c'; fi`
+
+test_event.o: tests/test_event.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_event.o -MD -MP -MF $(DEPDIR)/test_event.Tpo -c -o test_event.o `test -f 'tests/test_event.c' || echo '$(srcdir)/'`tests/test_event.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event.Tpo $(DEPDIR)/test_event.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event.c' object='test_event.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_event.o `test -f 'tests/test_event.c' || echo '$(srcdir)/'`tests/test_event.c
+
+test_event.obj: tests/test_event.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_event.obj -MD -MP -MF $(DEPDIR)/test_event.Tpo -c -o test_event.obj `if test -f 'tests/test_event.c'; then $(CYGPATH_W) 'tests/test_event.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event.Tpo $(DEPDIR)/test_event.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event.c' object='test_event.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_event.obj `if test -f 'tests/test_event.c'; then $(CYGPATH_W) 'tests/test_event.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event.c'; fi`
+
+test_event_operator.o: tests/test_event_operator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_event_operator.o -MD -MP -MF $(DEPDIR)/test_event_operator.Tpo -c -o test_event_operator.o `test -f 'tests/test_event_operator.c' || echo '$(srcdir)/'`tests/test_event_operator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event_operator.Tpo $(DEPDIR)/test_event_operator.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event_operator.c' object='test_event_operator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_event_operator.o `test -f 'tests/test_event_operator.c' || echo '$(srcdir)/'`tests/test_event_operator.c
+
+test_event_operator.obj: tests/test_event_operator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_event_operator.obj -MD -MP -MF $(DEPDIR)/test_event_operator.Tpo -c -o test_event_operator.obj `if test -f 'tests/test_event_operator.c'; then $(CYGPATH_W) 'tests/test_event_operator.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event_operator.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_event_operator.Tpo $(DEPDIR)/test_event_operator.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_event_operator.c' object='test_event_operator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_event_operator.obj `if test -f 'tests/test_event_operator.c'; then $(CYGPATH_W) 'tests/test_event_operator.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_event_operator.c'; fi`
+
+test_job.o: tests/test_job.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_job.o -MD -MP -MF $(DEPDIR)/test_job.Tpo -c -o test_job.o `test -f 'tests/test_job.c' || echo '$(srcdir)/'`tests/test_job.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job.Tpo $(DEPDIR)/test_job.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job.c' object='test_job.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_job.o `test -f 'tests/test_job.c' || echo '$(srcdir)/'`tests/test_job.c
+
+test_job.obj: tests/test_job.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_job.obj -MD -MP -MF $(DEPDIR)/test_job.Tpo -c -o test_job.obj `if test -f 'tests/test_job.c'; then $(CYGPATH_W) 'tests/test_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job.Tpo $(DEPDIR)/test_job.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job.c' object='test_job.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_job.obj `if test -f 'tests/test_job.c'; then $(CYGPATH_W) 'tests/test_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job.c'; fi`
+
+test_job_class.o: tests/test_job_class.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_job_class.o -MD -MP -MF $(DEPDIR)/test_job_class.Tpo -c -o test_job_class.o `test -f 'tests/test_job_class.c' || echo '$(srcdir)/'`tests/test_job_class.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_class.Tpo $(DEPDIR)/test_job_class.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_class.c' object='test_job_class.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_job_class.o `test -f 'tests/test_job_class.c' || echo '$(srcdir)/'`tests/test_job_class.c
+
+test_job_class.obj: tests/test_job_class.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_job_class.obj -MD -MP -MF $(DEPDIR)/test_job_class.Tpo -c -o test_job_class.obj `if test -f 'tests/test_job_class.c'; then $(CYGPATH_W) 'tests/test_job_class.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_class.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_class.Tpo $(DEPDIR)/test_job_class.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_class.c' object='test_job_class.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_job_class.obj `if test -f 'tests/test_job_class.c'; then $(CYGPATH_W) 'tests/test_job_class.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_class.c'; fi`
+
+test_job_process.o: tests/test_job_process.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_job_process.o -MD -MP -MF $(DEPDIR)/test_job_process.Tpo -c -o test_job_process.o `test -f 'tests/test_job_process.c' || echo '$(srcdir)/'`tests/test_job_process.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_process.Tpo $(DEPDIR)/test_job_process.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_process.c' object='test_job_process.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_job_process.o `test -f 'tests/test_job_process.c' || echo '$(srcdir)/'`tests/test_job_process.c
+
+test_job_process.obj: tests/test_job_process.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_job_process.obj -MD -MP -MF $(DEPDIR)/test_job_process.Tpo -c -o test_job_process.obj `if test -f 'tests/test_job_process.c'; then $(CYGPATH_W) 'tests/test_job_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_process.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_job_process.Tpo $(DEPDIR)/test_job_process.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_job_process.c' object='test_job_process.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_job_process.obj `if test -f 'tests/test_job_process.c'; then $(CYGPATH_W) 'tests/test_job_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_job_process.c'; fi`
+
+test_parse_conf.o: tests/test_parse_conf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_parse_conf.o -MD -MP -MF $(DEPDIR)/test_parse_conf.Tpo -c -o test_parse_conf.o `test -f 'tests/test_parse_conf.c' || echo '$(srcdir)/'`tests/test_parse_conf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_conf.Tpo $(DEPDIR)/test_parse_conf.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_conf.c' object='test_parse_conf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_parse_conf.o `test -f 'tests/test_parse_conf.c' || echo '$(srcdir)/'`tests/test_parse_conf.c
+
+test_parse_conf.obj: tests/test_parse_conf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_parse_conf.obj -MD -MP -MF $(DEPDIR)/test_parse_conf.Tpo -c -o test_parse_conf.obj `if test -f 'tests/test_parse_conf.c'; then $(CYGPATH_W) 'tests/test_parse_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_conf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_conf.Tpo $(DEPDIR)/test_parse_conf.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_conf.c' object='test_parse_conf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_parse_conf.obj `if test -f 'tests/test_parse_conf.c'; then $(CYGPATH_W) 'tests/test_parse_conf.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_conf.c'; fi`
+
+test_parse_job.o: tests/test_parse_job.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_parse_job.o -MD -MP -MF $(DEPDIR)/test_parse_job.Tpo -c -o test_parse_job.o `test -f 'tests/test_parse_job.c' || echo '$(srcdir)/'`tests/test_parse_job.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_job.Tpo $(DEPDIR)/test_parse_job.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_job.c' object='test_parse_job.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_parse_job.o `test -f 'tests/test_parse_job.c' || echo '$(srcdir)/'`tests/test_parse_job.c
+
+test_parse_job.obj: tests/test_parse_job.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_parse_job.obj -MD -MP -MF $(DEPDIR)/test_parse_job.Tpo -c -o test_parse_job.obj `if test -f 'tests/test_parse_job.c'; then $(CYGPATH_W) 'tests/test_parse_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_job.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_parse_job.Tpo $(DEPDIR)/test_parse_job.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_parse_job.c' object='test_parse_job.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_parse_job.obj `if test -f 'tests/test_parse_job.c'; then $(CYGPATH_W) 'tests/test_parse_job.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_parse_job.c'; fi`
+
+test_process.o: tests/test_process.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_process.o -MD -MP -MF $(DEPDIR)/test_process.Tpo -c -o test_process.o `test -f 'tests/test_process.c' || echo '$(srcdir)/'`tests/test_process.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_process.Tpo $(DEPDIR)/test_process.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_process.c' object='test_process.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_process.o `test -f 'tests/test_process.c' || echo '$(srcdir)/'`tests/test_process.c
+
+test_process.obj: tests/test_process.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_process.obj -MD -MP -MF $(DEPDIR)/test_process.Tpo -c -o test_process.obj `if test -f 'tests/test_process.c'; then $(CYGPATH_W) 'tests/test_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_process.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_process.Tpo $(DEPDIR)/test_process.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_process.c' object='test_process.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_process.obj `if test -f 'tests/test_process.c'; then $(CYGPATH_W) 'tests/test_process.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_process.c'; fi`
+
+test_system.o: tests/test_system.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_system.o -MD -MP -MF $(DEPDIR)/test_system.Tpo -c -o test_system.o `test -f 'tests/test_system.c' || echo '$(srcdir)/'`tests/test_system.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_system.Tpo $(DEPDIR)/test_system.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_system.c' object='test_system.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_system.o `test -f 'tests/test_system.c' || echo '$(srcdir)/'`tests/test_system.c
+
+test_system.obj: tests/test_system.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_system.obj -MD -MP -MF $(DEPDIR)/test_system.Tpo -c -o test_system.obj `if test -f 'tests/test_system.c'; then $(CYGPATH_W) 'tests/test_system.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_system.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_system.Tpo $(DEPDIR)/test_system.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tests/test_system.c' object='test_system.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_system.obj `if test -f 'tests/test_system.c'; then $(CYGPATH_W) 'tests/test_system.c'; else $(CYGPATH_W) '$(srcdir)/tests/test_system.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo

=== modified file 'init/conf.c'
--- init/conf.c	2011-05-25 19:25:11 +0000
+++ init/conf.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * conf.c - configuration management
  *
- * Copyright © 2009, 2010 Canonical Ltd.
+ * Copyright © 2009,2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -80,8 +80,7 @@
 static inline int is_conf_file_std     (const char *path)
 	__attribute__ ((warn_unused_result));
 
-static inline int
-is_conf_file_override                  (const char *path)
+static inline int is_conf_file_override(const char *path)
 	__attribute__ ((warn_unused_result));
 
 /**
@@ -154,7 +153,7 @@
 {
 	char *ptr = strrchr (path, '.');
 
-	if (ptr && IS_CONF_EXT (ptr))
+	if (ptr && (ptr > path) && (ptr[-1] != '/') && IS_CONF_EXT (ptr))
 		return TRUE;
 
 	return FALSE;
@@ -352,7 +351,8 @@
 			NihError *err;
 
 			err = nih_error_get ();
-			nih_error ("%s: %s: %s", source->path,
+			if (err->number != ENOENT)
+				nih_error ("%s: %s: %s", source->path,
 					_("Unable to load configuration"),
 					err->message);
 			nih_free (err);
@@ -372,7 +372,7 @@
  * out for editors that rename over the top, etc.
  *
  * We then parse the current state of the source.  The flag member is
- * toggled first, and this is propogated to all new and modified files and
+ * toggled first, and this is propagated to all new and modified files and
  * items that we find as a result of parsing.  Once done, we scan for
  * anything with the wrong flag, and delete them.
  *
@@ -538,7 +538,7 @@
  * tree.
  *
  * Otherwise we walk the tree ourselves and parse all files that we find,
- * propogating the value of the flag member to all files so that deletion
+ * propagating the value of the flag member to all files so that deletion
  * can be detected by the calling function.
  *
  * Returns: zero on success, negative value on raised error.
@@ -1041,8 +1041,10 @@
 		} else {
 			nih_debug ("Loading %s from %s", name, path);
 		}
+
 		file->job = parse_job (NULL, source->session, file->job,
-				       name, buf, len, &pos, &lineno);
+				name, buf, len, &pos, &lineno);
+
 		if (file->job) {
 			job_class_consider (file->job);
 		} else {

=== modified file 'init/conf.h'
--- init/conf.h	2011-05-25 19:25:11 +0000
+++ init/conf.h	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/control.c'
--- init/control.c	2011-05-25 19:25:11 +0000
+++ init/control.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * control.c - D-Bus connections, objects and methods
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -65,7 +65,7 @@
 /**
  * use_session_bus:
  *
- * If TRUE, connect to the D-Bus session bus rather than the system bus.
+ * If TRUE, connect to the D-Bus sessio bus rather than the system bus.
  *
  * Used for testing.
  **/

=== modified file 'init/control.h'
--- init/control.h	2011-05-25 19:25:11 +0000
+++ init/control.h	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/environ.c'
--- init/environ.c	2009-06-23 09:29:35 +0000
+++ init/environ.c	2011-06-17 11:15:58 +0000
@@ -354,50 +354,11 @@
 
 
 /**
- * environ_valid:
- * @key: string to check,
- * @len: length of @key.
- *
- * Check whether the environment key @key, that is @len characters long,
- * is valid according to the usual rules.  Names may begin with an alpha or
- * an underscore, and then consist of any number of alphanumerics and
- * underscores.
- *
- * Returns: TRUE if @key is a valid variable name, FALSE otherwise.
- **/
-int
-environ_valid (const char *key,
-	       size_t      len)
-{
-	nih_assert (key != NULL);
-
-	if (! len)
-		return FALSE;
-
-	if ((*key != '_')
-	    && ((*key < 'A') || (*key > 'Z'))
-	    && ((*key < 'a') || (*key > 'z')))
-		return FALSE;
-
-	while (--len) {
-		++key;
-		if ((*key != '_')
-		    && ((*key < 'A') || (*key > 'Z'))
-		    && ((*key < 'a') || (*key > 'z'))
-		    && ((*key < '0') || (*key > '9')))
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
  * environ_all_valid:
  * @env: NULL-terminated array of variables to check.
  *
  * Checks each of the environment variables in @env for validity; that is
- * each must be of KEY=VALUE form, and KEY must be a valid name for a
- * variable.
+ * each must be of KEY=VALUE form.
  *
  * This is intended for checking external data such as that in control
  * messages; environment lists defined in job definitions are actually
@@ -418,9 +379,6 @@
 		value = strchr (*e, '=');
 		if (! value)
 			return FALSE;
-
-		if (! environ_valid (*e, value - *e))
-			return FALSE;
 	}
 
 	return TRUE;
@@ -590,20 +548,6 @@
 
 			name_end = (*pos);
 
-			/* Check the environment variable name is
-			 * actually valid
-			 */
-			if (! environ_valid (*str + name_start,
-					     name_end - name_start)) {
-				nih_error_raise_printf (
-					ENVIRON_ILLEGAL_PARAM,
-					"%s: %.*s", _(ENVIRON_ILLEGAL_PARAM_STR),
-					(int)(name_end - name_start),
-					*str + name_start);
-
-				goto error;
-			}
-
 			/* Check for an expression operator; if we find one,
 			 * step over it and evalulate the rest of the bracketed
 			 * expression to find the substitute value.

=== modified file 'init/environ.h'
--- init/environ.h	2009-06-23 09:29:35 +0000
+++ init/environ.h	2011-06-17 11:15:58 +0000
@@ -43,7 +43,6 @@
 const char *  environ_getn      (char * const *env, const char *key,
 				 size_t len);
 
-int           environ_valid     (const char *key, size_t len);
 int           environ_all_valid (char * const *env);
 
 char *        environ_expand    (const void *parent, const char *string,

=== modified file 'init/errors.h'
--- init/errors.h	2009-06-23 09:29:35 +0000
+++ init/errors.h	2011-06-17 11:15:58 +0000
@@ -40,6 +40,7 @@
 	/* Errors while parsing configuration files */
 	PARSE_ILLEGAL_INTERVAL,
 	PARSE_ILLEGAL_EXIT,
+	PARSE_ILLEGAL_SIGNAL,
 	PARSE_ILLEGAL_UMASK,
 	PARSE_ILLEGAL_NICE,
 	PARSE_ILLEGAL_OOM,
@@ -60,9 +61,11 @@
 #define ENVIRON_MISMATCHED_BRACES_STR	N_("Mismatched braces")
 #define PARSE_ILLEGAL_INTERVAL_STR	N_("Illegal interval, expected number of seconds")
 #define PARSE_ILLEGAL_EXIT_STR		N_("Illegal exit status, expected integer")
+#define PARSE_ILLEGAL_SIGNAL_STR	N_("Illegal signal status, expected integer")
 #define PARSE_ILLEGAL_UMASK_STR		N_("Illegal file creation mask, expected octal integer")
 #define PARSE_ILLEGAL_NICE_STR		N_("Illegal nice value, expected -20 to 19")
-#define PARSE_ILLEGAL_OOM_STR		N_("Illegal oom adjustment, expected -16 to 15 or never")
+#define PARSE_ILLEGAL_OOM_STR		N_("Illegal oom adjustment, expected -16 to 15 or 'never'")
+#define PARSE_ILLEGAL_OOM_SCORE_STR	N_("Illegal oom score adjustment, expected -999 to 1000 or 'never'")
 #define PARSE_ILLEGAL_LIMIT_STR		N_("Illegal limit, expected 'unlimited' or integer")
 #define PARSE_EXPECTED_EVENT_STR	N_("Expected event")
 #define PARSE_EXPECTED_OPERATOR_STR	N_("Expected operator")

=== modified file 'init/event.c'
--- init/event.c	2011-05-25 19:25:11 +0000
+++ init/event.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * event.c - event queue and handling
  *
- * Copyright © 2009, 2010 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -126,6 +126,7 @@
 
 	event->session = NULL;
 	event->fd = -1;
+
 	event->progress = EVENT_PENDING;
 	event->failed = FALSE;
 

=== modified file 'init/job.c'
--- init/job.c	2011-05-25 19:25:11 +0000
+++ init/job.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * job.c - core state machine of tasks and services
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/job_class.c'
--- init/job_class.c	2011-05-25 19:25:11 +0000
+++ init/job_class.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * job_class.c - job class definition handling
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 
 #include <errno.h>
 #include <string.h>
+#include <signal.h>
 
 #include <nih/macros.h>
 #include <nih/alloc.h>
@@ -148,7 +149,7 @@
 JobClass *
 job_class_new (const void *parent,
 	       const char *name,
-	       Session *   session)
+	       Session    *session)
 {
 	JobClass *class;
 	int       i;
@@ -236,6 +237,7 @@
 	class->task = FALSE;
 
 	class->kill_timeout = JOB_DEFAULT_KILL_TIMEOUT;
+	class->kill_signal = SIGTERM;
 
 	class->respawn = FALSE;
 	class->respawn_limit = JOB_DEFAULT_RESPAWN_LIMIT;
@@ -248,7 +250,7 @@
 
 	class->umask = JOB_DEFAULT_UMASK;
 	class->nice = 0;
-	class->oom_adj = 0;
+	class->oom_score_adj = 0;
 
 	for (i = 0; i < RLIMIT_NLIMITS; i++)
 		class->limits[i] = NULL;
@@ -257,7 +259,7 @@
 	class->chdir = NULL;
 
 	class->deleted = FALSE;
-	class->debug = FALSE;
+	class->debug   = FALSE;
 
 	return class;
 

=== modified file 'init/job_class.h'
--- init/job_class.h	2011-05-25 19:25:11 +0000
+++ init/job_class.h	2011-06-17 11:15:58 +0000
@@ -87,6 +87,7 @@
  * @expect: what to expect before entering the next state after spawned,
  * @task: start requests are not unblocked until instances have finished,
  * @kill_timeout: time to wait between sending TERM and KILL signals,
+ * @kill_signal: first signal to send (usually SIGTERM),
  * @respawn: instances should be restarted if main process fails,
  * @respawn_limit: number of respawns in @respawn_interval that we permit,
  * @respawn_interval: barrier for @respawn_limit,
@@ -95,7 +96,7 @@
  * @console: how to arrange processes' stdin/out/err file descriptors,
  * @umask: file mode creation mask,
  * @nice: process priority,
- * @oom_adj: OOM killer adjustment,
+ * @oom_score_adj: OOM killer score adjustment,
  * @limits: resource limits indexed by resource,
  * @chroot: root directory of process (implies @chdir if not set),
  * @chdir: working directory of process,
@@ -132,6 +133,7 @@
 	int             task;
 
 	time_t          kill_timeout;
+	int		kill_signal;
 
 	int             respawn;
 	int             respawn_limit;
@@ -144,7 +146,7 @@
 
 	mode_t          umask;
 	int             nice;
-	int             oom_adj;
+	int             oom_score_adj;
 	struct rlimit  *limits[RLIMIT_NLIMITS];
 	char           *chroot;
 	char           *chdir;

=== modified file 'init/job_process.c'
--- init/job_process.c	2011-05-25 19:25:11 +0000
+++ init/job_process.c	2011-06-17 11:15:58 +0000
@@ -117,7 +117,7 @@
  * characters within the command member, in which case it is executed
  * directly using exec after splitting on whitespace.
  *
- * When exectued with the shell, if the command (which may be an entire
+ * When executed with the shell, if the command (which may be an entire
  * script) is reasonably small (less than 1KB) it is passed to the
  * shell using the POSIX-specified -c option.  Otherwise the shell is told
  * to read commands from one of the special /proc/self/fd/NN devices and NihIo
@@ -145,7 +145,8 @@
 	nih_local char  *script = NULL;
 	char           **e;
 	size_t           argc, envc;
-	int              error = FALSE, fds[2], trace = FALSE, shell = FALSE;
+	int              fds[2] = { -1, -1 };
+	int              error = FALSE, trace = FALSE, shell = FALSE;
 
 	nih_assert (job != NULL);
 
@@ -208,12 +209,9 @@
 
 			shell = TRUE;
 
-			/* FIXME actually always want it to be /proc/self/fd/3 and
-			 * dup2() in the child to make it that way ... no way
-			 * of passing that yet
-			 */
 			cmd = NIH_MUST (nih_sprintf (argv, "%s/%d",
-						     "/proc/self/fd", fds[0]));
+						     "/proc/self/fd",
+						     JOB_PROCESS_SCRIPT_FD));
 			NIH_MUST (nih_str_array_addp (&argv, NULL,
 						      &argc, cmd));
 		}
@@ -259,7 +257,7 @@
 
 	/* Spawn the process, repeat until fork() works */
 	while ((job->pid[process] = job_process_spawn (job->class, argv,
-						       env, trace)) < 0) {
+						       env, trace, fds[0])) < 0) {
 		NihError *err;
 
 		err = nih_error_get ();
@@ -316,6 +314,14 @@
 			nih_free (err);
 		}
 
+		/* We're feeding using a pipe, which has a file descriptor
+		 * on the child end even though it open()s it again using
+		 * a path. Instruct the shell to close this extra fd and
+		 * not to leak it.
+		 */
+		NIH_ZERO (nih_io_printf (io, "exec %d<&-\n",
+					 JOB_PROCESS_SCRIPT_FD));
+
 		NIH_ZERO (nih_io_write (io, script, strlen (script)));
 		nih_io_shutdown (io);
 	}
@@ -329,7 +335,8 @@
  * @class: job class of process to be spawned,
  * @argv: NULL-terminated list of arguments for the process,
  * @env: NULL-terminated list of environment variables for the process,
- * @trace: whether to trace this process.
+ * @trace: whether to trace this process,
+ * @script_fd: script file descriptor.
  *
  * This function spawns a new process using the @class details to set up the
  * environment for it; the process is always a session and process group
@@ -345,6 +352,9 @@
  * wait for this and then may use it to set options before continuing the
  * process.
  *
+ * If @script_fd is not -1, this file descriptor is dup()d to the special fd 9
+ * (moving any other out of the way if necessary).
+ *
  * This function only spawns the process, it is up to the caller to ensure
  * that the information is saved into the job and that the process is watched,
  * etc.
@@ -360,7 +370,8 @@
 job_process_spawn (JobClass     *class,
 		   char * const  argv[],
 		   char * const *env,
-		   int           trace)
+		   int           trace,
+		   int           script_fd)
 {
 	sigset_t  child_set, orig_set;
 	pid_t     pid;
@@ -426,8 +437,24 @@
 	 * far because read() returned zero.
 	 */
 	close (fds[0]);
+	if (fds[1] == JOB_PROCESS_SCRIPT_FD) {
+		int tmp = dup2 (fds[1], fds[0]);
+		close (fds[1]);
+		fds[1] = tmp;
+	}
 	nih_io_set_cloexec (fds[1]);
 
+	/* Move the script fd to special fd 9; the only gotcha is if that
+	 * would be our error descriptor, but that's handled above.
+	 */
+	if ((script_fd != -1) && (script_fd != JOB_PROCESS_SCRIPT_FD)) {
+		int tmp = dup2 (script_fd, JOB_PROCESS_SCRIPT_FD);
+		if (tmp < 0)
+			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_DUP, 0);
+		close (script_fd);
+		script_fd = tmp;
+	}
+
 	/* Become the leader of a new session and process group, shedding
 	 * any controlling tty (which we shouldn't have had anyway).
 	 */
@@ -486,16 +513,24 @@
 
 	/* Adjust the process OOM killer priority.
 	 */
-	if (class->oom_adj) {
+	if (class->oom_score_adj) {
+		int oom_value;
 		snprintf (filename, sizeof (filename),
-			  "/proc/%d/oom_adj", getpid ());
-
+			  "/proc/%d/oom_score_adj", getpid ());
+		oom_value = class->oom_score_adj;
 		fd = fopen (filename, "w");
+		if ((! fd) && (errno == EACCES)) {
+			snprintf (filename, sizeof (filename),
+				  "/proc/%d/oom_adj", getpid ());
+			oom_value = (class->oom_score_adj
+				     * ((class->oom_score_adj < 0) ? 17 : 15)) / 1000;
+			fd = fopen (filename, "w");
+		}
 		if (! fd) {
 			nih_error_raise_system ();
 			job_process_error_abort (fds[1], JOB_PROCESS_ERROR_OOM_ADJ, 0);
 		} else {
-			fprintf (fd, "%d\n", class->oom_adj);
+			fprintf (fd, "%d\n", oom_value);
 
 			if (fclose (fd)) {
 				nih_error_raise_system ();
@@ -715,6 +750,11 @@
 	err->error.number = JOB_PROCESS_ERROR;
 
 	switch (err->type) {
+	case JOB_PROCESS_ERROR_DUP:
+		err->error.message = NIH_MUST (nih_sprintf (
+				  err, _("unable to move script fd: %s"),
+				  strerror (err->errnum)));
+		break;
 	case JOB_PROCESS_ERROR_CONSOLE:
 		err->error.message = NIH_MUST (nih_sprintf (
 				  err, _("unable to open console: %s"),
@@ -820,9 +860,9 @@
  * @process: process to be killed.
  *
  * This function forces a @job to leave its current state by sending
- * @process the TERM signal, and maybe later the KILL signal.  The actual
- * state changes are performed by job_child_reaper when the process
- * has actually terminated.
+ * @process the "kill signal" defined signal (TERM by default), and maybe
+ * later the KILL signal.  The actual state changes are performed by
+ * job_child_reaper when the process has actually terminated.
  **/
 void
 job_process_kill (Job         *job,
@@ -833,15 +873,17 @@
 	nih_assert (job->kill_timer == NULL);
 	nih_assert (job->kill_process = -1);
 
-	nih_info (_("Sending TERM signal to %s %s process (%d)"),
+	nih_info (_("Sending %s signal to %s %s process (%d)"),
+		  nih_signal_to_name (job->class->kill_signal),
 		  job_name (job), process_name (process), job->pid[process]);
 
-	if (system_kill (job->pid[process], FALSE) < 0) {
+	if (system_kill (job->pid[process], job->class->kill_signal) < 0) {
 		NihError *err;
 
 		err = nih_error_get ();
 		if (err->number != ESRCH)
-			nih_warn (_("Failed to send TERM signal to %s %s process (%d): %s"),
+			nih_warn (_("Failed to send %s signal to %s %s process (%d): %s"),
+				  nih_signal_to_name (job->class->kill_signal),
 				  job_name (job), process_name (process),
 				  job->pid[process], err->message);
 		nih_free (err);
@@ -881,15 +923,17 @@
 	job->kill_timer = NULL;
 	job->kill_process = -1;
 
-	nih_info (_("Sending KILL signal to %s %s process (%d)"),
+	nih_info (_("Sending %s signal to %s %s process (%d)"),
+		  "KILL",
 		  job_name (job), process_name (process), job->pid[process]);
 
-	if (system_kill (job->pid[process], TRUE) < 0) {
+	if (system_kill (job->pid[process], SIGKILL) < 0) {
 		NihError *err;
 
 		err = nih_error_get ();
 		if (err->number != ESRCH)
-			nih_warn (_("Failed to send KILL signal to %s %s process (%d): %s"),
+			nih_warn (_("Failed to send %s signal to %s %s process (%d): %s"),
+				  "KILL",
 				  job_name (job), process_name (process),
 				  job->pid[process], err->message);
 		nih_free (err);
@@ -919,6 +963,7 @@
 {
 	Job         *job;
 	ProcessType  process;
+	NihLogLevel  priority;
 	const char  *sig;
 
 	nih_assert (pid > 0);
@@ -927,21 +972,31 @@
 	 * job's process it was.  If we don't know about it, then we simply
 	 * ignore the event.
 	 */
-	nih_debug ("Ignored event %x (%d) for process %d", event, status, pid);
 	job = job_process_find (pid, &process);
 	if (! job)
 		return;
 
+	/* Check the job's normal exit clauses to see whether this is a failure
+	 * worth warning about.
+	 */
+	priority = NIH_LOG_WARN;
+	for (size_t i = 0; i < job->class->normalexit_len; i++) {
+		if (job->class->normalexit[i] == status) {
+			priority = NIH_LOG_INFO;
+			break;
+		}
+	}
+
 	switch (event) {
 	case NIH_CHILD_EXITED:
 		/* Child exited; check status to see whether it exited
 		 * normally (zero) or with a non-zero status.
 		 */
 		if (status) {
-			nih_warn (_("%s %s process (%d) "
-				    "terminated with status %d"),
-				  job_name (job), process_name (process),
-				  pid, status);
+			nih_log_message (priority, _("%s %s process (%d) "
+						     "terminated with status %d"),
+					 job_name (job), process_name (process),
+					 pid, status);
 		} else {
 			nih_info (_("%s %s process (%d) exited normally"),
 				  job_name (job), process_name (process), pid);
@@ -958,9 +1013,9 @@
 		 */
 		sig = nih_signal_to_name (status);
 		if (sig) {
-			nih_warn (_("%s %s process (%d) killed by %s signal"),
-				  job_name (job), process_name (process),
-				  pid, sig);
+			nih_log_message (priority, _("%s %s process (%d) killed by %s signal"),
+					 job_name (job), process_name (process),
+					 pid, sig);
 		} else {
 			nih_warn (_("%s %s process (%d) killed by signal %d"),
 				  job_name (job), process_name (process),

=== modified file 'init/job_process.h'
--- init/job_process.h	2011-05-25 19:25:11 +0000
+++ init/job_process.h	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009 Canonical Ltd.
+ * Copyright © 2009,2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -32,12 +32,23 @@
 
 
 /**
+ * JOB_PROCESS_SCRIPT_FD:
+ *
+ * The special fd used to pass the script to the shell process, this can be
+ * anything from 3-9 (0-2 are stdin/out/err, 10 and above aren't guaranteed
+ * by POSIX).
+ **/
+#define JOB_PROCESS_SCRIPT_FD 9
+
+
+/**
  * JobProcessErrorType:
  *
  * These constants represent the different steps of process spawning that
  * can produce an error.
  **/
 typedef enum job_process_error_type {
+	JOB_PROCESS_ERROR_DUP,
 	JOB_PROCESS_ERROR_CONSOLE,
 	JOB_PROCESS_ERROR_RLIMIT,
 	JOB_PROCESS_ERROR_PRIORITY,
@@ -82,7 +93,7 @@
 int    job_process_run     (Job *job, ProcessType process);
 
 pid_t  job_process_spawn   (JobClass *class, char * const argv[],
-			    char * const *env, int trace)
+			    char * const *env, int trace, int script_fd)
 	__attribute__ ((warn_unused_result));
 
 void   job_process_kill    (Job *job, ProcessType process);

=== modified file 'init/main.c'
--- init/main.c	2011-05-25 19:25:11 +0000
+++ init/main.c	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010,2011 Canonical Ltd.
+ * Copyright © 2009-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -62,6 +62,7 @@
 
 /* Prototypes for static functions */
 #ifndef DEBUG
+static int  logger_kmsg     (NihLogLevel priority, const char *message);
 static void crash_handler   (int signum);
 #endif /* DEBUG */
 static void term_handler    (void *data, NihSignal *signal);
@@ -93,6 +94,8 @@
 static int restart = FALSE;
 
 
+extern int disable_sessions;
+
 /**
  * conf_dir:
  *
@@ -117,8 +120,6 @@
 
 extern int use_session_bus;
 
-extern int disable_sessions;
-
 /**
  * options:
  *
@@ -128,20 +129,20 @@
 	{ 0, "confdir", N_("specify alternative directory to load configuration files from"),
 		NULL, "DIR", &conf_dir, NULL },
 
-	{ 0, "startup-event", N_("specify an alternative initial event (for testing)"),
-		NULL, "NAME", &initial_event, NULL },
+	{ 0, "no-sessions", N_("Disable user and chroot sessions"),
+		NULL, NULL, &disable_sessions, NULL },
 
 	{ 0, "no-startup-event", N_("do not emit any startup event (for testing)"),
 		NULL, NULL, &disable_startup_event, NULL },
 
-	{ 0, "no-sessions", N_("Disable user and chroot sessions"),
-		NULL, NULL, &disable_sessions, NULL },
-
 	{ 0, "restart", NULL, NULL, NULL, &restart, NULL },
-	
+
 	{ 0, "session", N_("use D-Bus session bus rather than system bus (for testing)"),
 		NULL, NULL, &use_session_bus, NULL },
 
+	{ 0, "startup-event", N_("specify an alternative initial event (for testing)"),
+		NULL, "NAME", &initial_event, NULL },
+
 	/* Ignore invalid options */
 	{ '-', "--", NULL, NULL, NULL, NULL, NULL },
 
@@ -212,14 +213,18 @@
 			*arg_end = ' ';
 		}
 
+
 		/* Become the leader of a new session and process group, shedding
 		 * any controlling tty (which we shouldn't have had anyway - but
 		 * you never know what initramfs did).
 		 */
 		setsid ();
 
-		/* Set the standard file descriptors. */
-		if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
+		/* Set the standard file descriptors to the ordinary console device,
+		 * resetting it to sane defaults unless we're inheriting from another
+		 * init process which we know left it in a sane state.
+		 */
+		if (system_setup_console (CONSOLE_OUTPUT, (! restart)) < 0)
 			nih_free (nih_error_get ());
 
 		/* Set the PATH environment variable */
@@ -231,7 +236,7 @@
 		 */
 		if (chdir ("/"))
 			nih_warn ("%s: %s", _("Unable to set root directory"),
-					strerror (errno));
+				strerror (errno));
 
 		/* Mount the /proc and /sys filesystems, which are pretty much
 		 * essential for any Linux system; not to mention used by
@@ -242,7 +247,7 @@
 
 			err = nih_error_get ();
 			nih_warn ("%s: %s", _("Unable to mount /proc filesystem"),
-					err->message);
+				err->message);
 			nih_free (err);
 		}
 
@@ -251,10 +256,15 @@
 
 			err = nih_error_get ();
 			nih_warn ("%s: %s", _("Unable to mount /sys filesystem"),
-					err->message);
+				err->message);
 			nih_free (err);
 		}
+	} else {
+		nih_log_set_priority (NIH_LOG_DEBUG);
+		nih_debug ("Running with UID %d as PID %d (PPID %d)",
+				(int)getuid (), (int)getpid (), (int)getppid ());
 	}
+
 #else /* DEBUG */
 	nih_log_set_priority (NIH_LOG_DEBUG);
 	nih_debug ("Running with UID %d as PID %d (PPID %d)",
@@ -325,6 +335,7 @@
 	}
 #endif /* DEBUG */
 
+
 	/* Watch children for events */
 	NIH_MUST (nih_child_add_watch (NULL, -1, NIH_CHILD_ALL,
 				       job_process_handler, NULL));
@@ -335,7 +346,7 @@
 
 
 	/* Read configuration */
-	NIH_MUST (conf_source_new (NULL, DEFAULT_CONFFILE, CONF_FILE));
+	NIH_MUST (conf_source_new (NULL, CONFFILE, CONF_FILE));
 	NIH_MUST (conf_source_new (NULL, conf_dir, CONF_JOB_DIR));
 
 	conf_reload ();
@@ -348,7 +359,7 @@
 			err = nih_error_get ();
 			if (err->number != ENOMEM) {
 				nih_warn ("%s: %s", _("Unable to listen for private connections"),
-						err->message);
+					err->message);
 				nih_free (err);
 				break;
 			}
@@ -374,10 +385,12 @@
 #ifndef DEBUG
 	if (use_session_bus == FALSE) {
 		/* Now that the startup is complete, send all further logging output
-		 * to syslog instead of to the console.
+		 * to kmsg instead of to the console.
 		 */
-		openlog (program_name, LOG_CONS, LOG_DAEMON);
-		nih_log_set_logger (nih_logger_syslog);
+		if (system_setup_console (CONSOLE_NONE, FALSE) < 0)
+			nih_free (nih_error_get ());
+
+		nih_log_set_logger (logger_kmsg);
 	}
 #endif /* DEBUG */
 
@@ -456,6 +469,7 @@
 
 			closedir (piddir);
 		}
+
 	} else {
 		sigset_t mask;
 
@@ -480,6 +494,67 @@
 
 #ifndef DEBUG
 /**
+ * logger_kmsg:
+ * @priority: priority of message being logged,
+ * @message: message to log.
+ *
+ * Outputs the @message to the kernel log message socket prefixed with an
+ * appropriate tag based on @priority, the program name and terminated with
+ * a new line.
+ *
+ * Returns: zero on success, negative value on error.
+ **/
+static int
+logger_kmsg (NihLogLevel priority,
+	     const char *message)
+{
+	int   tag;
+	FILE *kmsg;
+
+	nih_assert (message != NULL);
+
+	switch (priority) {
+	case NIH_LOG_DEBUG:
+		tag = '7';
+		break;
+	case NIH_LOG_INFO:
+		tag = '6';
+		break;
+	case NIH_LOG_MESSAGE:
+		tag = '5';
+		break;
+	case NIH_LOG_WARN:
+		tag = '4';
+		break;
+	case NIH_LOG_ERROR:
+		tag = '3';
+		break;
+	case NIH_LOG_FATAL:
+		tag = '2';
+		break;
+	default:
+		tag = 'd';
+	}
+
+	kmsg = fopen ("/dev/kmsg", "w");
+	if (! kmsg)
+		return -1;
+
+	if (fprintf (kmsg, "<%c>%s: %s\n", tag, program_name, message) < 0) {
+		int saved_errno = errno;
+		fclose (kmsg);
+		errno = saved_errno;
+		return -1;
+	}
+
+	if (fclose (kmsg) < 0)
+		return -1;
+
+	return 0;
+}
+
+
+/**
  * crash_handler:
  * @signum: signal number received.
  *
@@ -711,7 +786,7 @@
 	if (conf_dir)
 		goto out;
 
-	conf_dir = DEFAULT_CONFDIR;
+	conf_dir = CONFDIR;
 
 	dir = getenv (CONFDIR_ENV);
 	if (! dir)

=== modified file 'init/man/init.5'
--- init/man/init.5	2011-05-25 19:25:11 +0000
+++ init/man/init.5	2011-06-17 11:15:58 +0000
@@ -1,10 +1,12 @@
-.TH init 5 2011-03-03 "Upstart"
+.TH init 5 2011-05-12 "Upstart"
 .\"
 .SH NAME
 init \- Upstart init daemon job configuration
 .\"
 .SH SYNOPSIS
 .B /etc/init/
+
+.B $HOME/.init/
 .\"
 .SH DESCRIPTION
 On startup, the Upstart
@@ -14,6 +16,11 @@
 directory, and watches for future changes to these files using
 .BR inotify (7).
 
+If D\-Bus has been configured to allow non\-privileged users to invoke all
+Upstart D\-Bus methods, Upstart is also able to manage User Jobs. See
+.B User Jobs
+for further details.
+
 To be considered by Upstart, files in this directory must have a
 recognized suffix and may also be present in sub\-directories.  There are
 two recognized suffixes:
@@ -44,7 +51,7 @@
 file.
 
 Each configuration file defines the template for a single \fIservice\fP
-(long\-running process or daemon) or \fItask\fP (short\-lived process).
+(long-running process or daemon) or \fItask\fP (short-lived process).
 
 Note that a configuration file is not itself a job: it is a description
 of an environmenta job could be run in.  A job is the runtime embodiment
@@ -53,7 +60,7 @@
 The configuration file name as displayed by Upstart and associated
 tooling is taken from its relative path within the directory without the
 extension.  For example a configuration file
-.I /etc/init/rc\-sysinit.conf
+.I /etc/init/rc-sysinit.conf
 is named
 .IR rc\-sysinit ,
 while a configuration file
@@ -65,6 +72,36 @@
 
 Configuration files are plain text and should not be executable.
 .\"
+.SS User Jobs
+
+A User Job is a job configuration file created by a non\-privileged user
+in their
+.B $HOME/.init/
+directory. Job configuration files in this directory have
+the same syntax as system job configuration files.
+
+Any user can create user jobs, but that user can control
+.I only
+jobs they create.
+
+Users are able to manage their jobs using the standard
+.BR initctl (8)
+facility.
+
+Note that a user job configuration file cannot have the same name as a
+system job configuration file.
+.\"
+.SS Chroot Support
+
+Upstart is able to manage jobs within a \fBchroot\fP(2). To control jobs
+within the chroot environment, use the standard
+.BR initctl (8)
+facility. Note that it is not necessary to install D\-Bus within the
+chroot (in fact it is not recommended).
+
+Note that User Jobs can be created within a chroot environment.
+
+.\"
 .SS Configuration File Format
 Each line begins with a configuration stanza and continues until either
 the end of the line or a line containing a closing stanza.  Line breaks
@@ -93,7 +130,7 @@
 .B script
 stanzas, only one of which is permitted.  These specify the executable
 or shell script that will be run when the job is considered to be running.
-Once this process terminates, the job stop.
+Once this process terminates, the job stops.
 
 All processes are run with the full job environment available as
 environment variables in their process.
@@ -553,15 +590,15 @@
 for more details.
 .\"
 .TP
-.B oom \fIADJUSTMENT\fR|\fBnever
+.B oom score \fIADJUSTMENT\fR|\fBnever
 Normally the OOM killer regards all processes equally, this stanza
 advises the kernel to treat this job differently.
 
 .I ADJUSTMENT
 may be an integer value from
-.I \-16
+.I -999
 (very unlikely to be killed by the OOM killer) up to
-.I 14
+.I 1000
 (very likely to be killed by the OOM killer).  It may also be the special
 value
 .B never
@@ -656,10 +693,20 @@
 .\"
 .SS Miscellaneous
 .TP
+.B kill signal \fISIGNAL
+Specifies the stopping signal, 
+.I SIGTERM
+by default, a job's main process will receive when stopping the
+running job.
+
+.nf
+kill signal INT
+.fi
+.\"
+.TP
 .B kill timeout \fIINTERVAL
 Specifies the interval between sending the job's main process the
-.I SIGTERM
-and
+"stopping" (see above) and
 .I SIGKILL
 signals when stopping the running job. Default is 5 seconds.
 .\"
@@ -739,7 +786,7 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010,2011 Canonical Ltd.
+Copyright \(co 2009-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -747,5 +794,6 @@
 .\"
 .SH SEE ALSO
 .BR init (8)
+.BR initctl (8)
 .BR sh (1)
 .BR upstart-events (7)

=== modified file 'init/man/init.8'
--- init/man/init.8	2011-05-25 19:25:11 +0000
+++ init/man/init.8	2011-06-17 11:15:58 +0000
@@ -18,7 +18,7 @@
 .B init
 are known as jobs and are defined by files in the
 .I /etc/init
-directory, unless overridden (see below).  See
+directory.  See
 .BR init (5)
 for more details on configuring Upstart.
 .\"
@@ -85,7 +85,7 @@
 .\"
 .TP
 .B \-\-session
-Connect to the D-Bus session bus. This should only be used for testing.
+Connect to the D\-Bus session bus. This should only be used for testing.
 .\"
 .TP
 .B \-\-startup-event \fIevent\fP
@@ -121,7 +121,7 @@
 .RB < https://launchpad.net/upstart/+bugs >
 .\"
 .SH COPYRIGHT
-Copyright \(co 2010, 2011 Canonical Ltd.
+Copyright \(co 2009\-2011 Canonical Ltd.
 .br
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -136,6 +136,5 @@
 .BR started (7)
 .BR stopping (7)
 .BR stopped (7)
-.BR stopped (7)
 .BR telinit (8)
 .BR upstart-events (7)

=== modified file 'init/parse_job.c'
--- init/parse_job.c	2011-05-25 19:25:11 +0000
+++ init/parse_job.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * parse_job.c - job definition parsing
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -280,12 +280,12 @@
  * of the returned job are freed, the returned job will also be
  * freed.
  *
- * Returns: If @update is NULL, returns new JobClass structure on success, NULL on raised error.
- * If @update is not NULL, returns @update on success, or NULL on error.
+ * Returns: if @update is NULL, returns new JobClass structure on success, NULL on raised error.
+ * If @update is not NULL, returns @update or NULL on error.
  **/
 JobClass *
 parse_job (const void *parent,
-	   Session *   session,
+	   Session    *session,
 	   JobClass   *update,
 	   const char *name,
 	   const char *file,
@@ -304,11 +304,11 @@
 		nih_debug ("Reusing JobClass %s (%s)",
 				class->name, class->path);
 	} else {
-	  nih_debug ("Creating new JobClass %s",
+		nih_debug ("Creating new JobClass %s",
 			  name);
-	  class = job_class_new (parent, name, session);
-	  if (! class)
-		  nih_return_system_error (NULL);
+		class = job_class_new (parent, name, session);
+		if (! class)
+			nih_return_system_error (NULL);
 	}
 
 	if (nih_config_parse_file (file, len, pos, lineno,
@@ -1225,7 +1225,7 @@
  *
  * Parse an env stanza from @file, extracting a single argument of the form
  * VAR or VAR=VALUE.  These are stored in the env array, which is increased
- * in size to accomodate the new value.
+ * in size to accommodate the new value.
  *
  * Returns: zero on success, negative value on error.
  **/
@@ -1796,6 +1796,7 @@
 {
 	size_t          a_pos, a_lineno;
 	int             ret = -1;
+	char           *endptr;
 	nih_local char *arg = NULL;
 
 	nih_assert (class != NULL);
@@ -1813,7 +1814,6 @@
 
 	if (! strcmp (arg, "timeout")) {
 		nih_local char *timearg = NULL;
-		char           *endptr;
 
 		/* Update error position to the timeout value */
 		*pos = a_pos;
@@ -1830,14 +1830,40 @@
 		if (errno || *endptr || (class->kill_timeout < 0))
 			nih_return_error (-1, PARSE_ILLEGAL_INTERVAL,
 					  _(PARSE_ILLEGAL_INTERVAL_STR));
-
-		ret = nih_config_skip_comment (file, len, &a_pos, &a_lineno);
-
+	} else if (! strcmp (arg, "signal")) {
+		unsigned long   status;
+		nih_local char *sigarg = NULL;
+		int		signal;
+
+		/* Update error position to the exit status */
+		*pos = a_pos;
+		if (lineno)
+			*lineno = a_lineno;
+
+		sigarg = nih_config_next_arg (NULL, file, len, &a_pos,
+					      &a_lineno);
+
+		if (! sigarg)
+			goto finish;
+
+		signal = nih_signal_from_name (sigarg);
+		if (signal < 0) {
+			errno = 0;
+			status = strtoul (sigarg, &endptr, 10);
+			if (errno || *endptr || (status > INT_MAX))
+				nih_return_error (-1, PARSE_ILLEGAL_SIGNAL,
+						  _(PARSE_ILLEGAL_SIGNAL_STR));
+		}
+
+		/* Set the signal */
+		class->kill_signal = signal;
 	} else {
 		nih_return_error (-1, NIH_CONFIG_UNKNOWN_STANZA,
 				  _(NIH_CONFIG_UNKNOWN_STANZA_STR));
 	}
 
+	ret = nih_config_skip_comment (file, len, &a_pos, &a_lineno);
+
 finish:
 	*pos = a_pos;
 	if (lineno)
@@ -2247,6 +2273,7 @@
 	nih_local char *arg = NULL;
 	char           *endptr;
 	size_t          a_pos, a_lineno;
+	int		oom_adj;
 	int             ret = -1;
 
 	nih_assert (class != NULL);
@@ -2261,12 +2288,37 @@
 	if (! arg)
 		goto finish;
 
-	if (! strcmp (arg, "never")) {
-		class->oom_adj = -17;
+	if (! strcmp (arg, "score")) {
+		nih_local char *scorearg = NULL;
+
+		/* Update error position to the score value */
+		*pos = a_pos;
+		if (lineno)
+			*lineno = a_lineno;
+
+		scorearg = nih_config_next_arg (NULL, file, len,
+						&a_pos, &a_lineno);
+		if (! scorearg)
+			goto finish;
+
+		if (! strcmp (scorearg, "never")) {
+			class->oom_score_adj = -1000;
+		} else {
+			errno = 0;
+			class->oom_score_adj = (int)strtol (scorearg, &endptr, 10);
+			if (errno || *endptr ||
+			    (class->oom_score_adj < -1000) ||
+			    (class->oom_score_adj > 1000))
+				nih_return_error (-1, PARSE_ILLEGAL_OOM,
+						  _(PARSE_ILLEGAL_OOM_SCORE_STR));
+		}
+	} else if (! strcmp (arg, "never")) {
+		class->oom_score_adj = -1000;
 	} else {
 		errno = 0;
-		class->oom_adj = (int)strtol (arg, &endptr, 10);
-		if (errno || *endptr || (class->oom_adj < -17) || (class->oom_adj > 15))
+		oom_adj = (int)strtol (arg, &endptr, 10);
+		class->oom_score_adj = (oom_adj * 1000) / ((oom_adj < 0) ? 17 : 15);
+		if (errno || *endptr || (oom_adj < -17) || (oom_adj > 15))
 			nih_return_error (-1, PARSE_ILLEGAL_OOM,
 					  _(PARSE_ILLEGAL_OOM_STR));
 	}

=== modified file 'init/parse_job.h'
--- init/parse_job.h	2011-05-25 19:25:11 +0000
+++ init/parse_job.h	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2009, 2010 Canonical Ltd.
+ * Copyright © 2010 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/paths.h'
--- init/paths.h	2011-05-25 19:25:11 +0000
+++ init/paths.h	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010-2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,6 @@
 #define CONSOLE "/dev/console"
 #endif
 
-
 /**
  * DEV_NULL:
  *
@@ -57,25 +56,23 @@
 
 
 /**
- * DEFAULT_CONFFILE:
+ * CONFFILE:
  *
  * Init daemon configuration file.
  **/
-#ifndef DEFAULT_CONFFILE
-#define DEFAULT_CONFFILE "/etc/init.conf"
+#ifndef CONFFILE
+#define CONFFILE "/etc/init.conf"
 #endif
 
-
 /**
- * DEFAULT_CONFDIR:
+ * CONFDIR:
  *
- * Top-level directory of the system configuration files.
+ * Default top-level directory of the system configuration files.
  **/
-#ifndef DEFAULT_CONFDIR
-#define DEFAULT_CONFDIR "/etc/init"
+#ifndef CONFDIR
+#define CONFDIR "/etc/init"
 #endif
 
-
 /**
  * USERCONFDIR:
  *
@@ -90,7 +87,7 @@
  * CONFDIR_ENV:
  *
  * If this environment variable is set, read configuration files
- * from the location specified, rather than DEFAULT_CONFDIR.
+ * from the location specified, rather than CONFDIR.
  *
  * Value is expected to be the full path to an alternative job
  * configuration directory.
@@ -110,7 +107,6 @@
 #define SHELL "/bin/sh"
 #endif
 
-
 /**
  * SBINDIR:
  *
@@ -120,7 +116,6 @@
 #define SBINDIR "/sbin"
 #endif
 
-
 /**
  * TELINIT:
  *
@@ -131,13 +126,11 @@
 #define TELINIT SBINDIR "/telinit"
 #endif
 
-
 /**
  * File extension for standard configuration files.
  **/
 #define CONF_EXT_STD ".conf"
 
-
 /**
  * File extension for override files.
  *
@@ -147,7 +140,6 @@
  **/
 #define CONF_EXT_OVERRIDE ".override"
 
-
 /**
  * Determine if specified path extension representes a standard
  * configuration file.
@@ -160,7 +152,6 @@
 #define IS_CONF_EXT_STD(period) \
 	(!strcmp (period, CONF_EXT_STD))
 
-
 /**
  * Determine if specified path extension representes an
  * override file.
@@ -173,7 +164,6 @@
 #define IS_CONF_EXT_OVERRIDE(period) \
 	(!strcmp (period, CONF_EXT_OVERRIDE))
 
-
 /**
  * Determine if specified filename has a valid configuration
  * file name extension.
@@ -187,5 +177,4 @@
 	(IS_CONF_EXT_STD(period) || \
 	 IS_CONF_EXT_OVERRIDE(period))
 
-
 #endif /* INIT_PATHS_H */

=== modified file 'init/session.c'
--- init/session.c	2011-05-25 19:25:11 +0000
+++ init/session.c	2011-06-17 11:15:58 +0000
@@ -2,7 +2,7 @@
  *
  * session.c - session segregation
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/session.h'
--- init/session.h	2011-05-25 19:25:11 +0000
+++ init/session.h	2011-06-17 11:15:58 +0000
@@ -1,6 +1,6 @@
 /* upstart
  *
- * Copyright © 2010 Canonical Ltd.
+ * Copyright © 2010,2011 Canonical Ltd.
  * Author: Scott James Remnant <[e-mail]>.
  *
  * This program is free software; you can redistribute it and/or modify

=== modified file 'init/system.c'
--- init/system.c	2010-04-27 19:52:43 +0000
+++ init/system.c	2011-06-17 11:15:58 +0000
@@ -48,27 +48,21 @@
 /**
  * system_kill:
  * @pid: process id of process,
- * @force: force the death.
- *
- * Kill all processes in the same process group as @pid, which may not
- * necessarily be the group leader.
- *
- * When @force is FALSE, the TERM signal is sent; when it is TRUE, KILL
- * is sent instead.
+ * @signal: signal to send.
+ *
+ * Send all processes in the same process group as @pid, which may not
+ * necessarily be the group leader the @signal.
  *
  * Returns: zero on success, negative value on raised error.
  **/
 int
 system_kill (pid_t pid,
-	     int   force)
+	     int   signal)
 {
-	int   signal;
 	pid_t pgid;
 
 	nih_assert (pid > 0);
 
-	signal = (force ? SIGKILL : SIGTERM);
-
 	pgid = getpgid (pid);
 
 	if (kill (pgid > 0 ? -pgid : pid, signal) < 0)

=== modified file 'init/system.h'
--- init/system.h	2010-04-27 19:52:43 +0000
+++ init/system.h	2011-06-17 11:15:58 +0000
@@ -29,7 +29,7 @@
 
 NIH_BEGIN_EXTERN
 
-int system_kill          (pid_t pid, int force)
+int system_kill          (pid_t pid, int signal)
 	__attribute__ ((warn_unused_result));
 
 int system_setup_console (ConsoleType type, int reset)

=== modified file 'init/tests/test_conf.c'
--- init/tests/test_conf.c	2011-05-25 19:25:11 +0000
+++ init/tests/test_conf.c	2011-06-17 11:15:58 +0000
@@ -1052,6 +1052,82 @@
 	nih_free (source);
 
 
+	/* Check that a file without the ".conf" extension is ignored.
+	 */
+	TEST_FEATURE ("without .conf extension only");
+
+	TEST_FILENAME (dirname);
+	mkdir (dirname, 0755);
+
+	source = conf_source_new (NULL, dirname, CONF_JOB_DIR);
+	ret = conf_source_reload (source);
+
+	TEST_EQ (ret, 0);
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	strcpy (filename, dirname);
+	strcat (filename, "/munchkin");
+
+	f = fopen (filename, "w");
+	fprintf (f, "exec echo\n");
+	fclose (f);
+
+	nfds = 0;
+	FD_ZERO (&readfds);
+	FD_ZERO (&writefds);
+	FD_ZERO (&exceptfds);
+
+	nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds);
+	nih_io_handle_fds (&readfds, &writefds, &exceptfds);
+
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	nih_free (source);
+
+	unlink (filename);
+	rmdir (dirname);
+
+
+	/* Check that a file named just ".conf" is ignored.
+	 */
+	TEST_FEATURE ("with literal .conf file");
+
+	TEST_FILENAME (dirname);
+	mkdir (dirname, 0755);
+
+	source = conf_source_new (NULL, dirname, CONF_JOB_DIR);
+	ret = conf_source_reload (source);
+
+	TEST_EQ (ret, 0);
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	strcpy (filename, dirname);
+	strcat (filename, "/.conf");
+
+	f = fopen (filename, "w");
+	fprintf (f, "exec echo\n");
+	fclose (f);
+
+	nfds = 0;
+	FD_ZERO (&readfds);
+	FD_ZERO (&writefds);
+	FD_ZERO (&exceptfds);
+
+	nih_io_select_fds (&nfds, &readfds, &writefds, &exceptfds);
+	nih_io_handle_fds (&readfds, &writefds, &exceptfds);
+
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	nih_free (source);
+
+	unlink (filename);
+	rmdir (dirname);
+
+
 	/* Consume all available inotify instances so that the following
 	 * tests run without inotify.
 	 */
@@ -1508,6 +1584,76 @@
 	nih_free (source);
 
 
+	/* Check that a file without the ".conf" extension is ignored
+	 * when it exists at reload time.
+	 */
+	TEST_FEATURE ("without .conf extension only");
+
+	TEST_FILENAME (dirname);
+	mkdir (dirname, 0755);
+
+	source = conf_source_new (NULL, dirname, CONF_JOB_DIR);
+	ret = conf_source_reload (source);
+
+	TEST_EQ (ret, 0);
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	strcpy (filename, dirname);
+	strcat (filename, "/munchkin");
+
+	f = fopen (filename, "w");
+	fprintf (f, "exec echo\n");
+	fclose (f);
+
+	ret = conf_source_reload (source);
+
+	TEST_EQ (ret, 0);
+
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	nih_free (source);
+
+	unlink (filename);
+	rmdir (dirname);
+
+
+	/* Check that a file named just ".conf" is ignored when it exists
+	 * at reload time.
+	 */
+	TEST_FEATURE ("with literal .conf file");
+
+	TEST_FILENAME (dirname);
+	mkdir (dirname, 0755);
+
+	source = conf_source_new (NULL, dirname, CONF_JOB_DIR);
+	ret = conf_source_reload (source);
+
+	TEST_EQ (ret, 0);
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	strcpy (filename, dirname);
+	strcat (filename, "/.conf");
+
+	f = fopen (filename, "w");
+	fprintf (f, "exec echo\n");
+	fclose (f);
+
+	ret = conf_source_reload (source);
+
+	TEST_EQ (ret, 0);
+
+	TEST_HASH_EMPTY (source->files);
+	TEST_HASH_EMPTY (job_classes);
+
+	nih_free (source);
+
+	unlink (filename);
+	rmdir (dirname);
+
+
 	nih_log_set_priority (NIH_LOG_MESSAGE);
 
 	/* Release consumed instances */

=== modified file 'init/tests/test_control.c'
--- init/tests/test_control.c	2011-05-25 19:25:11 +0000
+++ init/tests/test_control.c	2011-06-17 11:15:58 +0000
@@ -1617,44 +1617,6 @@
 	dbus_message_unref (method);
 
 
-	/* Check that if an entry in the environment list has an invalid name,
-	 * an error is returned immediately.
-	 */
-	TEST_FEATURE ("with invalid name in environment list");
-	method = dbus_message_new_method_call (
-		dbus_bus_get_unique_name (conn),
-		DBUS_PATH_UPSTART,
-		DBUS_INTERFACE_UPSTART,
-		"EmitEvent");
-
-	dbus_connection_send (client_conn, method, &serial);
-	dbus_connection_flush (client_conn);
-	dbus_message_unref (method);
-
-	TEST_DBUS_MESSAGE (conn, method);
-	assert (dbus_message_get_serial (method) == serial);
-
-	message = nih_new (NULL, NihDBusMessage);
-	message->connection = conn;
-	message->message = method;
-
-	env = nih_str_array_new (message);
-	assert (nih_str_array_add (&env, message, NULL, "FOO BAR=BAZ"));
-
-	ret = control_emit_event (NULL, message, "test", env, TRUE);
-
-	TEST_LT (ret, 0);
-
-	dbus_error = (NihDBusError *)nih_error_get ();
-	TEST_ALLOC_SIZE (dbus_error, sizeof (NihDBusError));
-	TEST_EQ (dbus_error->number, NIH_DBUS_ERROR);
-	TEST_EQ_STR (dbus_error->name, DBUS_ERROR_INVALID_ARGS);
-	nih_free (dbus_error);
-
-	nih_free (message);
-	dbus_message_unref (method);
-
-
 	TEST_DBUS_CLOSE (conn);
 	TEST_DBUS_CLOSE (client_conn);
 	TEST_DBUS_END (dbus_pid);

=== modified file 'init/tests/test_environ.c'
--- init/tests/test_environ.c	2011-05-25 19:25:11 +0000
+++ init/tests/test_environ.c	2011-06-17 11:15:58 +0000
@@ -904,83 +904,6 @@
 
 
 void
-test_valid (void)
-{
-	int valid;
-
-	TEST_FUNCTION ("environ_valid");
-
-	/* Check that an all-uppercase key is valid. */
-	TEST_FEATURE ("with uppercase key");
-	valid = environ_valid ("FOO", 3);
-
-	TEST_TRUE (valid);
-
-
-	/* Check that an all-lowercase key is valid. */
-	TEST_FEATURE ("with lowercase key");
-	valid = environ_valid ("foo", 3);
-
-	TEST_TRUE (valid);
-
-
-	/* Check that an all-alphanumeric key is valid. */
-	TEST_FEATURE ("with alphanumeric key");
-	valid = environ_valid ("Foo45", 5);
-
-	TEST_TRUE (valid);
-
-
-	/* Check that an underscores in the key are valid. */
-	TEST_FEATURE ("with underscores in key");
-	valid = environ_valid ("FOO_45", 6);
-
-	TEST_TRUE (valid);
-
-
-	/* Check that a key may begin with an underscore. */
-	TEST_FEATURE ("with initial underscore");
-	valid = environ_valid ("_FOO", 4);
-
-	TEST_TRUE (valid);
-
-
-	/* Check that a key may not begin with a number. */
-	TEST_FEATURE ("with initial number");
-	valid = environ_valid ("9FOO", 4);
-
-	TEST_FALSE (valid);
-
-
-	/* Check that a key may not begin with any other character. */
-	TEST_FEATURE ("with initial dash");
-	valid = environ_valid ("-FOO", 4);
-
-	TEST_FALSE (valid);
-
-
-	/* Check that a key may not contain dashes. */
-	TEST_FEATURE ("with dash");
-	valid = environ_valid ("FOO-BAR", 7);
-
-	TEST_FALSE (valid);
-
-
-	/* Check that a key may not contain spaces. */
-	TEST_FEATURE ("with space");
-	valid = environ_valid ("FOO BAR", 7);
-
-	TEST_FALSE (valid);
-
-
-	/* Check that the length is honoured. */
-	TEST_FEATURE ("with longer string then key");
-	valid = environ_valid ("FOO BAR", 3);
-
-	TEST_TRUE (valid);
-}
-
-void
 test_all_valid (void)
 {
 	char **env;
@@ -1026,22 +949,6 @@
 	TEST_FALSE (valid);
 
 	nih_free (env);
-
-
-	/* Check that an entry with an invalid key name means the table
-	 * is also not valid.
-	 */
-	TEST_FEATURE ("with invalid key");
-	env = nih_str_array_new (NULL);
-	assert (nih_str_array_add (&env, NULL, NULL, "FOO=BAR"));
-	assert (nih_str_array_add (&env, NULL, NULL, "BAR BEE=FOO"));
-	assert (nih_str_array_add (&env, NULL, NULL, "WIBBLE=woo"));
-
-	valid = environ_all_valid (env);
-
-	TEST_FALSE (valid);
-
-	nih_free (env);
 }
 
 
@@ -1648,19 +1555,6 @@
 	nih_free (error);
 
 
-	/* Check that attempting to expand an illegal variable name results in
-	 * an error being raised.
-	 */
-	TEST_FEATURE ("with expansion of illegal variable");
-	str = environ_expand (NULL, "this is a ${WIB WOB} test", env);
-
-	TEST_EQ_P (str, NULL);
-
-	error = nih_error_get ();
-	TEST_EQ (error->number, ENVIRON_ILLEGAL_PARAM);
-	nih_free (error);
-
-
 	/* Check that inventing a new operator results in an error
 	 * being raised.
 	 */
@@ -1701,7 +1595,6 @@
 	test_lookup ();
 	test_get ();
 	test_getn ();
-	test_valid ();
 	test_all_valid ();
 	test_expand ();
 

=== modified file 'init/tests/test_job_class.c'
--- init/tests/test_job_class.c	2011-05-25 19:25:11 +0000
+++ init/tests/test_job_class.c	2011-06-17 11:15:58 +0000
@@ -119,6 +119,7 @@
 		TEST_EQ (class->task, FALSE);
 
 		TEST_EQ (class->kill_timeout, 5);
+		TEST_EQ (class->kill_signal, SIGTERM);
 
 		TEST_EQ (class->respawn, FALSE);
 		TEST_EQ (class->respawn_limit, 10);
@@ -131,7 +132,7 @@
 
 		TEST_EQ (class->umask, 022);
 		TEST_EQ (class->nice, 0);
-		TEST_EQ (class->oom_adj, 0);
+		TEST_EQ (class->oom_score_adj, 0);
 
 		for (i = 0; i < RLIMIT_NLIMITS; i++)
 			TEST_EQ_P (class->limits[i], NULL);
@@ -1942,7 +1943,7 @@
 	TEST_FREE_TAG (message);
 
 	env = nih_str_array_new (message);
-	assert (nih_str_array_add (&env, message, NULL, "FOO BAR=wibble"));
+	assert (nih_str_array_add (&env, message, NULL, "FOO"));
 
 	ret = job_class_start (class, message, env, TRUE);
 
@@ -2378,7 +2379,7 @@
 	TEST_FREE_TAG (message);
 
 	env = nih_str_array_new (message);
-	assert (nih_str_array_add (&env, message, NULL, "FOO BAR=wibble"));
+	assert (nih_str_array_add (&env, message, NULL, "FOO"));
 
 	ret = job_class_stop (class, message, env, TRUE);
 
@@ -2862,7 +2863,7 @@
 	TEST_FREE_TAG (message);
 
 	env = nih_str_array_new (message);
-	assert (nih_str_array_add (&env, message, NULL, "FOO BAR=wibble"));
+	assert (nih_str_array_add (&env, message, NULL, "FOO"));
 
 	ret = job_class_restart (class, message, env, TRUE);
 

=== modified file 'init/tests/test_job_process.c'
--- init/tests/test_job_process.c	2011-05-25 19:25:11 +0000
+++ init/tests/test_job_process.c	2011-06-17 11:15:58 +0000
@@ -821,7 +821,7 @@
 
 	class = job_class_new (NULL, "test", NULL);
 
-	pid = job_process_spawn (class, args, NULL, FALSE);
+	pid = job_process_spawn (class, args, NULL, FALSE, -1);
 	TEST_GT (pid, 0);
 
 	waitpid (pid, NULL, 0);
@@ -859,7 +859,7 @@
 	class = job_class_new (NULL, "test", NULL);
 	class->console = CONSOLE_NONE;
 
-	pid = job_process_spawn (class, args, NULL, FALSE);