From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sree Harsha Totakura Subject: [PATCH] gnu: gnunet: Fix failing testcases. Date: Wed, 12 Feb 2014 16:15:32 +0100 Message-ID: <1392218132-13440-2-git-send-email-sreeharsha@totakura.in> References: <52FAA177.4030701@totakura.in> <1392218132-13440-1-git-send-email-sreeharsha@totakura.in> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDbYR-0000OY-BS for guix-devel@gnu.org; Wed, 12 Feb 2014 10:16:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDbYL-0003OF-Vq for guix-devel@gnu.org; Wed, 12 Feb 2014 10:16:51 -0500 Received: from mail-out1.informatik.tu-muenchen.de ([131.159.0.8]:64122 helo=smtp1.informatik.tu-muenchen.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDbYL-0003Nz-P9 for guix-devel@gnu.org; Wed, 12 Feb 2014 10:16:45 -0500 In-Reply-To: <1392218132-13440-1-git-send-email-sreeharsha@totakura.in> 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 * gnu/packages/gnunet.scm (gnurl): Add pkg-config. * gnu/packages/patches/gnunet-fix-tests.patch: Append fix for integration testcases. --- 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 f3448a7..960a5d7 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -153,8 +153,9 @@ and support for SSL3 and TLS.") ("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 @@ supports HTTPS, HTTPS and GnuTLS.") (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 1957b17..4276db5 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 = -- 1.7.10.4