[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gnu: ngircd: Fix test suite.
From: |
Taylan Ulrich Bayırlı/Kammer |
Subject: |
[PATCH] gnu: ngircd: Fix test suite. |
Date: |
Mon, 30 Mar 2015 17:00:47 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) |
>From 4e5f345f54395a02f87a0ce0c3e68d2b71e20259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<address@hidden>
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
- [PATCH] gnu: ngircd: Fix test suite.,
Taylan Ulrich Bayırlı/Kammer <=