From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id CEljD9mLhmDS6AAAgWs5BA (envelope-from ) for ; Mon, 26 Apr 2021 11:46:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EGobC9mLhmBycQAAB5/wlQ (envelope-from ) for ; Mon, 26 Apr 2021 09:46:01 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0866425A81 for ; Mon, 26 Apr 2021 11:46:01 +0200 (CEST) Received: from localhost ([::1]:37064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laxoV-0006fF-Ku for larch@yhetil.org; Mon, 26 Apr 2021 05:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laxlf-0004MX-1V for guix-patches@gnu.org; Mon, 26 Apr 2021 05:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laxle-0006Wv-8k for guix-patches@gnu.org; Mon, 26 Apr 2021 05:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laxle-00035k-6M for guix-patches@gnu.org; Mon, 26 Apr 2021 05:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48028] [PATCH wip-gnome v3 04/10] gnu: libsoup: Simplify adjustment of tests. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 09:43: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: Raghav Gururajan , 48028@debbugs.gnu.org Received: via spool by 48028-submit@debbugs.gnu.org id=B48028.161943016611862 (code B ref 48028); Mon, 26 Apr 2021 09:43:02 +0000 Received: (at 48028) by debbugs.gnu.org; 26 Apr 2021 09:42:46 +0000 Received: from localhost ([127.0.0.1]:44607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laxlN-00035F-Pq for submit@debbugs.gnu.org; Mon, 26 Apr 2021 05:42:46 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:34887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laxlL-000356-2L for 48028@debbugs.gnu.org; Mon, 26 Apr 2021 05:42:44 -0400 Received: from nijino.local (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FTKgg2kkbz1LBRt; Mon, 26 Apr 2021 11:42:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FTKgg2kkbz1LBRt DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1619430159; bh=K+QxNs6v0FCIDJ3cvtzcgL5HB/BE5YSBqaOmEHX4dIA=; h=Subject:From:To:Date:In-Reply-To:References:From; b=YErMJum2G9j+BaXd5l+DcvYkhlp6aTEsiZTSuWD1BY3aru8zDlHxn+qhR4QNr3ZVP 410XovgD5/R02L2Y9Nx2zTkkYgDMM4T24lr1LmX3CU1sJ35BcWQ8tllgIajrixtBR1 KcIdgM0Dxz1+uZSbVeInHHnJePgpLDk12M8Uuz6s= Message-ID: From: Leo Prikler Date: Mon, 26 Apr 2021 11:42:38 +0200 In-Reply-To: <20210426092215.31032-4-rg@raghavgururajan.name> References: <20210426092215.31032-1-rg@raghavgururajan.name> <20210426092215.31032-4-rg@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 0866425A81 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: izGTTwJpWj5Q Am Montag, den 26.04.2021, 05:22 -0400 schrieb Raghav Gururajan: > 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 I'm sorry, but after a closer look, I will have to reject this patch. This does far more than just disable a few failing tests, it disables all tests, that happen to lie in a file with a failing one. Please stick to disabling patches in the C files, or if the entire C file fails just disable that one in meson (but try to see if you can disable it in C as well). Regards, Leo