From 6e3cc9888f345f66657e98ccf7b70e3669b3a71f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 12 Jan 2014 13:25:39 +2000 Subject: [PATCH] [PATCH] test/emacs: replace the use of process-attributes with signal-process --- 16/4749b3f54396b6a5331f155d38bb0133159687 | 102 ++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 16/4749b3f54396b6a5331f155d38bb0133159687 diff --git a/16/4749b3f54396b6a5331f155d38bb0133159687 b/16/4749b3f54396b6a5331f155d38bb0133159687 new file mode 100644 index 000000000..d4ab61043 --- /dev/null +++ b/16/4749b3f54396b6a5331f155d38bb0133159687 @@ -0,0 +1,102 @@ +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 127D8431FD0 + for ; Sat, 11 Jan 2014 09:25:59 -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 mUosXxvQ2SQs for ; + Sat, 11 Jan 2014 09:25:52 -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 D8EAC431FC3 + for ; Sat, 11 Jan 2014 09:25:52 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1W22Jk-0004S2-HV; Sat, 11 Jan 2014 13:25:52 -0400 +Received: (nullmailer pid 16887 invoked by uid 1000); Sat, 11 Jan 2014 + 17:25:48 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH] test/emacs: replace the use of process-attributes with + signal-process +Date: Sat, 11 Jan 2014 13:25:39 -0400 +Message-Id: <1389461139-20249-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.5.2 +In-Reply-To: +References: +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 17:25:59 -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). + +Historically and 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). +--- + +Thanks to Domo for the simpler solution. Now that I think about it, +perhaps this makes sense as a debian only update, since it currently +fails only on Debian/Hurd, which according to the GNU project is the +only "working distribution + + 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..37fcb3d 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 ++ (signal-process pid 0))) ++ + (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