daemonize / daemon_with_notify: ignore Ubuntu 13.10 brain death.

Apparently init --user adopts orphans.  To quote the author
Stewart Smith:

  As much as one can be happy in Ubuntu breaking something that has been
  true for what must be approaching 40 years, yep, I'm happy for you to
  make the changes.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/ccan/daemon_with_notify/test/run.c b/ccan/daemon_with_notify/test/run.c
index 3af42043d1739c9bededda315a3d9d6003242870..17d9ee9174e38351923a100c6f16e27fce21c40b 100644 (file)
--- a/ccan/daemon_with_notify/test/run.c
+++ b/ccan/daemon_with_notify/test/run.c
@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
        struct child_data daemonized;
        pid_t pid;
 
-       plan_tests(6);
+       plan_tests(5);
 
        if (pipe(fds) != 0)
                err(1, "Failed pipe");
@@ -65,7 +65,9 @@ int main(int argc, char *argv[])
                err(1, "Failed read");
 
        ok1(daemonized.pid != pid);
+#if 0  /* Believe it or not, this fails under Ubuntu 13.10 (Upstart) */
        ok1(daemonized.ppid == 1);
+#endif
        ok1(daemonized.in_root_dir);
        ok1(daemonized.read_from_stdin == 0);
        ok1(daemonized.write_to_stdout == 0);

diff --git a/ccan/daemonize/test/run.c b/ccan/daemonize/test/run.c
index 9bb966da240b722e33dd29f9ea4cfc399f159b5d..73f021118a8c77505136fe25e0b6a3eb9b2eeed8 100644 (file)
--- a/ccan/daemonize/test/run.c
+++ b/ccan/daemonize/test/run.c
@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
        struct child_data daemonized;
        pid_t pid;
 
-       plan_tests(6);
+       plan_tests(5);
 
        if (pipe(fds) != 0)
                err(1, "Failed pipe");
@@ -64,7 +64,9 @@ int main(int argc, char *argv[])
                err(1, "Failed read");
 
        ok1(daemonized.pid != pid);
+#if 0  /* Believe it or not, this fails under Ubuntu 13.10 (Upstart) */
        ok1(daemonized.ppid == 1);
+#endif
        ok1(daemonized.in_root_dir);
        ok1(daemonized.read_from_stdin == EBADF);
        ok1(daemonized.write_to_stdout == EBADF);