[PATCH] test/emacs: replace the use of process-attributes with kill(1)

diff --git a/07/f640c3d83ee7282bd6fc670471095c675caea2 b/07/f640c3d83ee7282bd6fc670471095c675caea2
new file mode 100644 (file)
index 0000000..5db682d
--- /dev/null
+++ b/07/f640c3d83ee7282bd6fc670471095c675caea2
@@ -0,0 +1,99 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id D4890431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 10 Jan 2014 18:36:40 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 8jqfP7L9y+iq for <notmuch@notmuchmail.org>;\r
+       Fri, 10 Jan 2014 18:36:34 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AF7C8431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 10 Jan 2014 18:36:34 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1W1oR3-0001Pp-6w; Fri, 10 Jan 2014 22:36:29 -0400\r
+Received: (nullmailer pid 18457 invoked by uid 1000); Sat, 11 Jan 2014\r
+       02:36:25 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test/emacs: replace the use of process-attributes with\r
+ kill(1)\r
+Date: Fri, 10 Jan 2014 22:36:18 -0400\r
+Message-Id: <1389407778-15724-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <87a9ffofsc.fsf@zancas.localnet>\r
+References: <87a9ffofsc.fsf@zancas.localnet>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 11 Jan 2014 02:36:41 -0000\r
+\r
+In some environments (at least Hurd), process-attributes is\r
+unimplimented and always returns nil.  This ends up causing test\r
+failures (see e.g. id:87a9ffofsc.fsf@zancas.localnet).\r
+\r
+According to POSIX 1003.1-2001, a signal of 0 can be used to check the\r
+validity of a pid. This seems less heinous than parsing the output of ps(1).\r
+---\r
+\r
+I'm not sure if it would be worthwhile, but a point release could\r
+finally get notmuch compiling on Hurd again.  At least the test in the parent message does pass on Hurd with this patch\r
+\r
+ test/test-lib.el | 15 +++++++++------\r
+ 1 file changed, 9 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index d26b49f..93f5f72 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -77,19 +77,22 @@ invisible text."\r
+       (setq start next-pos)))\r
+     str))\r
+ \r
++;; process-attributes is not defined everywhere, so define an\r
++;; alternate way to test if a process still exists.\r
++\r
++(defun test-process-running (pid)\r
++  (= 0\r
++   (call-process "kill" nil nil nil "-0" (int-to-string pid))))\r
++\r
+ (defun orphan-watchdog-check (pid)\r
+   "Periodically check that the process with id PID is still\r
+ running, quit if it terminated."\r
+-  (if (not (process-attributes pid))\r
++  (if (not (test-process-running pid))\r
+       (kill-emacs)))\r
+ \r
+ (defun orphan-watchdog (pid)\r
+   "Initiate orphan watchdog check."\r
+-  ; If process-attributes returns nil right away, that probably means\r
+-  ; it is unimplimented. So we delay two minutes before killing emacs.\r
+-  (if (process-attributes pid)\r
+-      (run-at-time 60 60 'orphan-watchdog-check pid)\r
+-    (run-at-time 120 60 'orphan-watchdog-check pid)))\r
++  (run-at-time 60 60 'orphan-watchdog-check pid))\r
+ \r
+ (defun hook-counter (hook)\r
+   "Count how many times a hook is called.  Increments\r
+-- \r
+1.8.5.2\r
+\r