From 7af52bd58c834f46e54f27592b6193604f7119fb Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Wed, 12 Feb 2014 16:15:32 +0100 Subject: gnu: gnunet: Fix failing testcases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnunet.scm (gnurl): Add pkg-config. * gnu/packages/patches/gnunet-fix-tests.patch: Append fix for integration testcases. Signed-off-by: Ludovic Courtès --- gnu/packages/gnunet.scm | 8 +++++--- gnu/packages/patches/gnunet-fix-tests.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index f3448a7e63..960a5d725c 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -153,8 +153,9 @@ (define-public gnurl ("libidn" ,libidn) ("zlib" ,zlib))) (native-inputs - `(("perl" ,perl) - ("groff" ,groff) + `(("groff" ,groff) + ("perl" ,perl) + ("pkg-config" ,pkg-config) ("python" ,python-2))) (arguments `(#:configure-flags '("--enable-ipv6" "--with-gnutls" "--without-libssh2" @@ -211,7 +212,8 @@ (define-public gnunet (search-patch "gnunet-fix-scheduler.patch") ;; Patch to fix bugs in testcases: ;; * Disable peerinfo-tool tests as they depend on reverse DNS lookups - ;; * Allow revocation testcase to run on loopback; upstream: #32130 + ;; * Allow revocation and integration-tests testcases to run on + ;; loopback; upstream: #32130, #32326 ;; * Skip GNS testcases requiring DNS lookups; upstream: #32118 (search-patch "gnunet-fix-tests.patch"))) (patch-flags '("-p0")))) diff --git a/gnu/packages/patches/gnunet-fix-tests.patch b/gnu/packages/patches/gnunet-fix-tests.patch index 1957b17119..4276db5a7c 100644 --- a/gnu/packages/patches/gnunet-fix-tests.patch +++ b/gnu/packages/patches/gnunet-fix-tests.patch @@ -44,3 +44,15 @@ Index: src/gns/test_gns_cname_lookup.sh rm -rf /tmp/test-gnunet-gns-peer-1/ TEST_DOMAIN_PLUS="www.gnu" +Index: src/integration-tests/confs/test_defaults.conf +=================================================================== +--- src/integration-tests/confs/test_defaults.conf (revision 32320) ++++ src/integration-tests/confs/test_defaults.conf (working copy) +@@ -17,6 +17,7 @@ + EXTERNAL_ADDRESS = 127.0.0.1 + INTERNAL_ADDRESS = 127.0.0.1 + BINDTO = 127.0.0.1 ++RETURN_LOCAL_ADDRESSES = YES + + [hostlist] + SERVERS = -- cgit v1.2.3