01/01: gnu: ngircd: Fix test suite.

[Taylan Ulrich B.]

taylanub pushed a commit to branch master
in repository guix.

commit 9af288a6805661627f964d9e9eae4518aaad266e
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date:   Mon Mar 30 10:37:11 2015 +0200

    gnu: ngircd: Fix test suite.
    
    * gnu/packages/messaging.scm (ngircd): Overwrite getpid.sh with a more
      reliable version.
---
 gnu/packages/messaging.scm |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

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")