From patchwork Mon Apr 26 09:08:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28890 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 1F2FB27BC7C; Mon, 26 Apr 2021 10:09:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56FFB27BC7D for ; Mon, 26 Apr 2021 10:09:12 +0100 (BST) Received: from localhost ([::1]:44604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laxEt-0001kn-HZ for patchwork@mira.cbaines.net; Mon, 26 Apr 2021 05:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laxEm-0001ij-7I for guix-patches@gnu.org; Mon, 26 Apr 2021 05:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laxEl-0002wC-Uz for guix-patches@gnu.org; Mon, 26 Apr 2021 05:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laxEl-0002CP-Pf for guix-patches@gnu.org; Mon, 26 Apr 2021 05:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48028] [PATCH wip-gnome v2 04/10] gnu: libsoup: Simplify adjustment of tests. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 09:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48028@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 48028-submit@debbugs.gnu.org id=B48028.16194281278347 (code B ref 48028); Mon, 26 Apr 2021 09:09:03 +0000 Received: (at 48028) by debbugs.gnu.org; 26 Apr 2021 09:08:47 +0000 Received: from localhost ([127.0.0.1]:44481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laxEU-0002AU-Gw for submit@debbugs.gnu.org; Mon, 26 Apr 2021 05:08:46 -0400 Received: from out2.migadu.com ([188.165.223.204]:35685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laxER-00029a-VU for 48028@debbugs.gnu.org; Mon, 26 Apr 2021 05:08:44 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1619428123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RfFoNl2xu8p2mJTLZMUJX3uQhP+9Jgs9o4Qn4PW+4aU=; b=nnkC4TemgCL6RrylKOZJwNeBQxAUxAWQZl6Y+XltnsviAB/DsJelq6a56Y8KwtThQ9yWJ+ XcbWKQYRN2Cy8EtX8gUEJIhVB2O7W3lA2/0vbkNr4NcoAlsJLDA3U5sOSSnHRbxLvdiszM +GO4oC+zq6eyvPJbuwy+V3q7yjhlJyNrZD1J/sF2quHwjthiz08a4KOnEch1L6yFafI71F YBKNBoR3Fy2ucN6v25OGoiEDiaRiQb99sTvZ4NYKS1psF3dO4gkgtKWuvbJyqXZqnF+fIC 5/4VVODpWzLfc1l94KLIJuivZV3OG38179Ad/PILqYBSfqQiwRUqP8MD/2cHVQ== Date: Mon, 26 Apr 2021 05:08:17 -0400 Message-Id: <20210426090823.30672-4-rg@raghavgururajan.name> In-Reply-To: <20210426090823.30672-1-rg@raghavgururajan.name> References: <20210426090823.30672-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches Switch from using mutiple C files to single meson.build file. * gnu/packages/gnome.scm (libsoup)[phases](adjust-tests): Modify. --- gnu/packages/gnome.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 97cf80c586..c8e7b55f6c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4927,20 +4927,14 @@ libxml to ease remote use of the RESTful API.") #t))) (add-after 'unpack 'adjust-tests (lambda _ - ;; This test fails due to missing /etc/nsswitch.conf - ;; in the build environment. - (substitute* "tests/socket-test.c" - ((".*/sockets/unconnected.*") "")) - - ;; These fail because "subdomain.localhost" does not resolve in - ;; the build environment. - (substitute* "tests/hsts-test.c" - ((".*/hsts/basic.*") "") - ((".*/hsts/subdomains.*") "") - ((".*/hsts/superdomain.*") "") - ((".*/hsts/utf8-address.*") "")) - (substitute* "tests/hsts-db-test.c" - ((".*/hsts-db/subdomains.*") "")) + (substitute* "tests/meson.build" + ;; These fail because "subdomain.localhost" does not resolve in + ;; the build environment. + (("[ \t]*\\['hsts', true, \\[\\]\\],") "") + (("[ \t]*\\['hsts-db', true, \\[\\]\\],") "") + ;; This test fails due to missing /etc/nsswitch.conf + ;; in the build environment. + (("[ \t]*\\['socket', true, \\[\\]\\],") "")) ;; Generate a self-signed certificate that has "localhost" as its ;; 'dnsName'. Failing to do that, and starting with GnuTLS