02/02: gnu: librstp: Allow tests to run.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 340f9b9fa0bdbe65c570b57504d39ff30fc1dd4a
Author: Ludovic Courtès <address@hidden>
Date:   Fri Feb 10 23:16:46 2017 +0100

    gnu: librstp: Allow tests to run.
    
    Fixes <http://bugs.gnu.org/25669>.
    Reported by Maxim Cournoyer <address@hidden>.
    
    Before that, the sender process in test/rtpw_test.sh would try to read
    words from the parent directory, and thus it would return almost
    immediately (as if it had read an empty file, no error).
    
    * gnu/packages/telephony.scm (libsrtp)[inputs]: Add PSMISC.
    [arguments]: In 'patch-dictionary-location' phase, set the name of the
    'FAQ' file rather than the name of its parent directory.
---
 gnu/packages/telephony.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index c393caa..b0cefe4 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -215,7 +215,8 @@ internet.")
               (base32
                "1w2g623qkd7gdyydglx2hr4s2y237lg0nszjmy7z8d2iq8hvb9sn"))))
     (native-inputs
-     `(("procps" ,procps)))
+     `(("psmisc" ,psmisc)                        ;some tests require 'killall'
+       ("procps" ,procps)))
     (build-system gnu-build-system)
     (arguments
      '(#:test-target "runtest"
@@ -234,8 +235,8 @@ internet.")
              (substitute* "test/rtpw.c"
                (("/usr/share/dict/words")
                 (string-append (assoc-ref %build-inputs "procps")
-                               "/share/doc/procps-ng"))
-                (("words.txt") "FAQ"))
+                               "/share/doc/procps-ng/FAQ"))
+               (("words.txt") "FAQ"))
              #t)))))
     (synopsis "Secure RTP (SRTP) Reference Implementation")
     (description "This package provides an implementation of the Secure