From patchwork Tue Jul 18 14:40:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51815 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8C83927BBF7; Tue, 18 Jul 2023 15:44:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 813A627BBE2 for ; Tue, 18 Jul 2023 15:43:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlty-0007iO-Dh; Tue, 18 Jul 2023 10:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLltu-0007Yi-3Q for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qLltt-0000uj-Rc for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltt-0006dg-Nt for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 15/43] gnu: c-ares: Skip failing tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969128325268 (code B ref 64711); Tue, 18 Jul 2023 14:42:05 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:23 +0000 Received: from localhost ([127.0.0.1]:53776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltC-0006ZS-Lo for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlt2-0006XX-TQ for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:13 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLlsx-0000cK-Ls; Tue, 18 Jul 2023 10:41:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=yMUI/P27AJEPXsaKNC0epovnDsh6NLgPV4h2doxaewo=; b=JMmEP+8/2uyNvXUvROON oT6PS8a584mUkgSpM7eoqK1ofLvyJg31Rr7dtyAZ3n7JBrm/wGmqzQyUk6gZ1P8P8M47m6YS1V05h +nm5Qfi9gr0I3nwQSvxhCXSeBz5LM1W7xatOJofiucwpdVKlQAR9dHAvF3eC/SDFf4m7BTQe0pAJr MO2gpXAfkdEMzaaIyV6tOhKxnk0FSwq1njHuFJq1jql8xrjy6smgJ4AYeqGXp8AFyPBrytmcGS7uO 4s6qKnY5COGbzcYUapPu/HIV8kjscKPtMFNgFA3SQ+dXR3jczTRLYEw8/OvxL3dxhLV7ILkvMwRsG Hz9QMoj6jHbzUA==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLlsx-0004hp-93; Tue, 18 Jul 2023 10:41:07 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:08 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/adns.scm (c-ares)[arguments: When building natively on the Hurd, add phases 'skip-tests' and 'filter-hurd-tests'. --- gnu/packages/adns.scm | 68 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 913d885af4..ead40bce1b 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019, 2021 Marius Bakke +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,9 +21,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages adns) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages m4) @@ -76,18 +79,69 @@ (define-public c-ares "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'filter-live-tests - (lambda _ - ;; Filter tests that require internet access. - (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'filter-live-tests + (lambda _ + ;; Filter tests that require internet access. + (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (substitute* "test/ares-test-main.cc" + (("(^| )main *\\(.*" all) + (string-append all " exit (77);\n"))))) + (add-after 'filter-live-tests 'filter-hurd-tests + (lambda _ + (setenv "GTEST_FILTER" + (string-append + (getenv "GTEST_FILTER") + ":.*Basic/2" + ":.*CancelImmediate/2" + ":.*CancelImmediateGetHostByAddr/2" + ":.*CancelLater/1" + ":.*FamilyUnspecified/2" + ":.*FamilyV6/2" + ":.*GetAddrInfoParallelLookups/1" + ":.*GetHostByAddrDestroy/2" + ":.*GetHostByNameCNAMENoData/2" + ":.*GetHostByNameDestroyAbsolute/2" + ":.*GetHostByNameDestroyRelative/2" + ":.*GetHostByNameParallelLookups/1" + ":.*HostAlias/2" + ":.*HostAliasMissing/2" + ":.*HostAliasMissingFile/2" + ":.*NotImplResponse/2" + ":.*RefusedResponse/2" + ":.*Resend/1" + ":.*RetryWithoutEDNS/2" + ":.*SearchDomains/2" + ":.*SearchDomainsBare/2" + ":.*SearchDomainsServFailOnAAAA/2" + ":.*SearchDomainsWithResentReply/1" + ":.*SearchHighNdots/2" + ":.*SearchNoDataThenFail/2" + ":.*SearchNoDataThenNoDataBare/2" + ":.*SearchNoDataThenSuccess/2" + ":.*ServFailResponse/2" + ":.*SimpleQuery/2" + ":.*SockCallback/2" + ":.*SockConfigureCallback/2" + ":.*SortListV4/2" + ":.*SortListV6/2" + ":.*ThirdServer/2" + ":.*TruncationRetry/1" + ":.*UnspecifiedFamilyCname6A4/2" + ":.*UnspecifiedFamilyV4/2" + ":.*UnspecifiedFamilyV6/2"))))) + #~())))) (native-inputs (list pkg-config)) (home-page "https://c-ares.haxx.se/") (synopsis "C library for asynchronous DNS requests") (description - "C-ares is a C library that performs DNS requests and name resolution + "C-ares is a C library that performs DNS requests and name resolution asynchronously. It is intended for applications which need to perform DNS queries without blocking, or need to perform multiple DNS queries in parallel. The primary examples of such applications are servers which communicate with