From patchwork Mon Apr 26 08:11:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28885 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 A569327BC7C; Mon, 26 Apr 2021 09:13:25 +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 2E40127BC7D for ; Mon, 26 Apr 2021 09:13:25 +0100 (BST) Received: from localhost ([::1]:59576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lawMu-0007RH-DJ for patchwork@mira.cbaines.net; Mon, 26 Apr 2021 04:13:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lawMa-00074Y-Rk for guix-patches@gnu.org; Mon, 26 Apr 2021 04:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lawMZ-0003I4-5O for guix-patches@gnu.org; Mon, 26 Apr 2021 04:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lawMZ-0000lD-00 for guix-patches@gnu.org; Mon, 26 Apr 2021 04:13:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48028] [PATCH wip-gnome 4/8] gnu: libsoup: Simplify adjustment of tests and disable ssl-test. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 08:13:02 +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.16194247372808 (code B ref 48028); Mon, 26 Apr 2021 08:13:02 +0000 Received: (at 48028) by debbugs.gnu.org; 26 Apr 2021 08:12:17 +0000 Received: from localhost ([127.0.0.1]:44396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lawLp-0000j7-5I for submit@debbugs.gnu.org; Mon, 26 Apr 2021 04:12:17 -0400 Received: from out2.migadu.com ([188.165.223.204]:27590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lawLj-0000hz-Nv for 48028@debbugs.gnu.org; Mon, 26 Apr 2021 04:12:12 -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=1619424731; 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=cMKG7sCBdkO90g4Q3CY4LLU2fOZmU65PdOzc4L+Suy4=; b=OiRtUVBaJ46f0JEuzGQP/jTo/iSvm33pYwnIliuyI9foj4LX+huErAGBDg2Oi9rS4yRQT0 ueblbO63oHDVFUw1aCkbgZKHoQS+5T4lF7LvuGccX5cjS2jMDsITa1h01pDqIopayItSwN iLG7/8BfJWoemVSkIXlgUGlmerQdyPM7qJ5Eokyzzo5jkHVvYaeQa9ip2ybJ9VnyElGaAA Y5MeqAMKI/fdLIBA8bwfjhB3tnfKiYnZ7pFbgeNhX/0i+9C9lXFBLEeMVrlVkqGOGqZibL CGghrH1yC/SVfyxSosX2c8Xja8kTYPDyEz+v9GwzW6bsXMN5DHZhy+jo0AvJQg== Date: Mon, 26 Apr 2021 04:11:41 -0400 Message-Id: <20210426081145.28926-4-rg@raghavgururajan.name> In-Reply-To: <20210426081145.28926-1-rg@raghavgururajan.name> References: <20210426081145.28926-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 * gnu/packages/gnome.scm (libsoup)[phases](adjust-tests): Modify. [native-inputs]: Remove gnutls. --- gnu/packages/gnome.scm | 70 +++++++----------------------------------- 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 97cf80c586..29779c39af 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4927,64 +4927,17 @@ 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.*") "")) - - ;; Generate a self-signed certificate that has "localhost" as its - ;; 'dnsName'. Failing to do that, and starting with GnuTLS - ;; 3.5.12, tests such as "ssl-tests" fail: - ;; - ;; ERROR:ssl-test.c:406:do_tls_interaction_test: Unexpected status 6 Unacceptable TLS certificate (expected 200 OK) - ;; - ;; 'certtool' is interactive so we have to pipe it the answers. - ;; Reported at . - (let ((pipe (open-output-pipe "certtool --generate-self-signed \ - --load-privkey tests/test-key.pem --outfile tests/test-cert.pem"))) - (for-each (lambda (line) - (display line pipe) - (newline pipe)) - '("" ;Common name - "" ;UID - "Guix" ;Organizational unit name - "GNU" ;Organization name - "" ;Locality name - "" ;State or province - "" ;Country - "" ;subject's domain component (DC) - "" ;E-mail - "" ;serial number - "-1" ;expiration time - "N" ;belong to authority? - "N" ;web client certificate? - "N" ;IPsec IKE? - "Y" ;web server certificate? - "localhost" ;dnsName of subject - "" ;dnsName of subject (end) - "" ;URI of subject - "127.0.0.1" ;IP address of subject - "" ;signing? - "" ;encryption (RSA)? - "" ;data encryption? - "" ;sign OCSP requests? - "" ;sign code? - "" ;time stamping? - "" ;email protection? - "" ;URI of the CRL distribution point - "y" ;above info OK? - )) - (close-pipe pipe)) + (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, \\[\\]\\],") "") + ;; FIX-ME: ssl-test fails, starting with + ;; glib-networking 2.68.x. + (("[ \t]*\\['ssl', true, \\[\\]\\],") "")) #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) @@ -5006,7 +4959,6 @@ libxml to ease remote use of the RESTful API.") ("vala" ,vala) ("php" ,php) ("curl" ,curl) - ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) (propagated-inputs ;; libsoup-2.4.pc refers to all these.