Created by James Hunt on 2013-11-04 and last modified on 2014-01-13
Get this branch:
bzr branch lp:~jamesodhunt/upstart/bug-530779
Only James Hunt can upload to this branch. If you are James Hunt please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

James Hunt

Recent revisions

1582. By James Hunt on 2014-01-13

* Sync with lp:upstart.

1581. By James Hunt on 2014-01-13

* init/tests/test_job_process.c: test_run_subreaper(): Separate the
  prctl(PR_SET_CHILD_SUBREAPER) test into a new function and only call
  if the running kernel supports that prctl.
* test/test_util_common.c: get_kernel_version(): New function.

1580. By James Hunt on 2013-12-12

* init/tests/data/upstart-1.12.json: New test data file.
* test/test_daemon.c: New test utility.
* init/Makefile.am: Add "upstart-1.12.json".
* init/job.c:
  - Updated copyright.
  - job_deserialise(): Generalise logic to handle missing pids when
    upgrading from a version that does not support PROCESS_SECURITY and
* init/job_process.c:
  - Copyright and comments.
  - job_process_terminated(): Consider job ready when daemons parent
    exits, rather than when the requisite number of forks have been
    performed (based on lp:~vorlon/upstart/lp.530779-rough-draft)
    (LP: #530779).
  - job_process_trace_new(): Corrected comment header.
  - job_process_trace_new_child(): Don't consider job ready once
    requisite number of forks have occured any more.
  - job_process_trace_fork(): Save parent process.
* init/process.c:
  - Updated copyright.
  - process_name(): Added PROCESS_DAEMON_PARENT for completeness.
  - process_from_name(): Added PROCESS_DAEMON_PARENT for completeness.
  - process_deserialise_all(): Generalise logic to handle missing pids
    when upgrading from a version that does not support PROCESS_SECURITY and
  - process_type_enum_to_str(): Added PROCESS_DAEMON_PARENT for completeness.
  - process_type_str_to_enum(): Added PROCESS_DAEMON_PARENT for completeness.
* init/process.h: Comments for ProcessType (which must be kept in order).
* init/tests/test_job_process.c:
  - test_run(): New test:
    - "with daemon where parent waits for ultimate child before exiting"
  - test_spawn(): Remove temporary files.
  - test_kill(): Extra checks.
  - test_handler():
    - Remove erroneous UPSTART_LOGDIR code - not used by this test.
    - Add daemon parent checks.
* init/tests/test_state.c:
  - test_job_environ_upgrade(): Add additional checks to ensure that
    json not containing PROCESS_DAEMON_PARENT elements correctly deserialises
    into empty elements.
  - test_daemon_parent_state(): New test that checks a data file containing
    jobs with and without PROCESS_DAEMON_PARENTS can be deserialised.
* test/Makefile.am: Updated for test_daemon.
* test/test_util_common.c:
  - get_test_daemon_binary(): New function.
  - file_line_count(): New function.
* test/test_util_common.h: TIMED_BLOCK(): New utility macro.

1577. By James Hunt on 2013-11-25

* Merge of lp:~vorlon/upstart/lp.1254326.

1576. By Steve Langasek on 2013-11-18

Fix a typo in the manpage

1575. By James Hunt on 2013-11-18

* Merge of lp:~xnox/upstart/no-multibuild.

1574. By James Hunt on 2013-11-18

* init/tests/test_state.c: Remove unused variables to make test compile
  in strict mode.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.