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