From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: [PATCH] gnu: ngircd: Fix test suite. Date: Mon, 30 Mar 2015 17:00:47 +0200 Message-ID: <87y4mefs2o.fsf@taylan.uni.cx> Mime-Version: 1.0 Content-Type: text/x-diff Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcbBV-0008FP-OR for guix-devel@gnu.org; Mon, 30 Mar 2015 11:01:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcbBP-0001nX-Ql for guix-devel@gnu.org; Mon, 30 Mar 2015 11:01:01 -0400 Received: from mail-wg0-x22b.google.com ([2a00:1450:400c:c00::22b]:36109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcbBP-0001nK-KM for guix-devel@gnu.org; Mon, 30 Mar 2015 11:00:55 -0400 Received: by wgra20 with SMTP id a20so177550597wgr.3 for ; Mon, 30 Mar 2015 08:00:54 -0700 (PDT) Received: from taylan.uni.cx (p200300514A62C2DB0213E8FFFEED36FB.dip0.t-ipconnect.de. [2003:51:4a62:c2db:213:e8ff:feed:36fb]) by mx.google.com with ESMTPSA id lx10sm16116931wjb.17.2015.03.30.08.00.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Mar 2015 08:00:49 -0700 (PDT) Content-Disposition: inline; filename=0001-gnu-ngircd-Fix-test-suite.patch List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org >From 4e5f345f54395a02f87a0ce0c3e68d2b71e20259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= Date: Mon, 30 Mar 2015 10:37:11 +0200 Subject: [PATCH] gnu: ngircd: Fix test suite. * gnu/packages/messaging.scm (ngircd): Overwrite getpid.sh with a more reliable version. --- gnu/packages/messaging.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 462c500..fd857b1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -201,7 +201,22 @@ dictionaries. HexChat can be extended with multiple addons.") 'configure 'post-configure (lambda _ (substitute* "src/ngircd/Makefile" - (("/bin/sh") (which "sh")))) + (("/bin/sh") (which "sh"))) + ;; The default getpid.sh does a sloppy grep over 'ps -ax' output, + ;; which fails arbitrarily. + (with-output-to-file "src/testsuite/getpid.sh" + (lambda () + (display + (string-append + "#!" (which "sh") "\n" + "ps -C \"$1\" -o pid=\n")))) + ;; Our variant of getpid.sh does not work for interpreter names if a + ;; shebang script is run directly as "./foo", so patch cases where + ;; the test suite relies on this. + (substitute* "src/testsuite/start-server.sh" + ;; It runs 'getpid.sh sh' to test if it works at all. Run it on + ;; 'make' instead. + (("getpid.sh sh") "getpid.sh make"))) %standard-phases))) (home-page "http://ngircd.barton.de/") (synopsis "Lightweight Internet Relay Chat server for small networks") -- 2.2.1