unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Raghav Gururajan via Guix-patches via <guix-patches@gnu.org>
To: 48028@debbugs.gnu.org
Cc: Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#48028] [PATCH wip-gnome v2 04/10] gnu: libsoup: Simplify adjustment of tests.
Date: Mon, 26 Apr 2021 05:08:17 -0400	[thread overview]
Message-ID: <20210426090823.30672-4-rg@raghavgururajan.name> (raw)
In-Reply-To: <20210426090823.30672-1-rg@raghavgururajan.name>

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
-- 
2.31.1





  parent reply	other threads:[~2021-04-26  9:09 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-26  8:09 [bug#48028] [PATCH wip-gnome 0/8]: Misc Raghav Gururajan via Guix-patches via
2021-04-26  8:11 ` [bug#48028] [PATCH wip-gnome 1/8] gnu: gtkmm@2: Remove inheritance from gtkmm@3 Raghav Gururajan via Guix-patches via
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 2/8] gnu: gtkmm: Change build-system Raghav Gururajan via Guix-patches via
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 3/8] gnu: gtkmm: Add missing native-input and correct propagated-inputs Raghav Gururajan via Guix-patches via
2021-04-26 20:52     ` Maxime Devos
2021-04-27  9:32       ` Raghav Gururajan via Guix-patches via
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 4/8] gnu: libsoup: Simplify adjustment of tests and disable ssl-test Raghav Gururajan via Guix-patches via
2021-04-26  8:34     ` Leo Prikler
2021-04-26  9:24       ` Raghav Gururajan via Guix-patches via
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 5/8] gnu: libsoup: Add missing argument and input Raghav Gururajan via Guix-patches via
2021-04-26  8:40     ` Leo Prikler
2021-04-26  9:28       ` Raghav Gururajan via Guix-patches via
2021-04-26  9:47         ` Leo Prikler
2021-04-26 10:32           ` Raghav Gururajan via Guix-patches via
2021-04-26 17:26             ` [bug#48028] [PATCH wip-gnome v4 3/8] gnu: gtkmm: Add missing native-input and correct propagated-inputs Mark H Weaver
2021-04-27  9:37               ` Raghav Gururajan via Guix-patches via
2021-04-27 21:49                 ` Mark H Weaver
2021-05-05 19:06                   ` Raghav Gururajan via Guix-patches via
2021-05-05 20:10                     ` Raghav Gururajan via Guix-patches via
2021-05-05 20:55                       ` Raghav Gururajan via Guix-patches via
2021-05-07 17:25                         ` Raghav Gururajan via Guix-patches via
2021-05-07 18:40                         ` Mark H Weaver
2021-05-07 19:05                           ` Leo Prikler
2021-05-07 18:34                       ` Mark H Weaver
2021-05-07 18:37                         ` Raghav Gururajan via Guix-patches via
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 6/8] gnu: libsoup: Update home-page Raghav Gururajan via Guix-patches via
2021-04-26  8:46     ` Leo Prikler
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 7/8] gnu: python-pycairo: Update to 1.20.0 Raghav Gururajan via Guix-patches via
2021-04-26  8:11   ` [bug#48028] [PATCH wip-gnome 8/8] gnu: python-pygobject: Update to 3.40.1 Raghav Gururajan via Guix-patches via
2021-04-26 20:47   ` [bug#48028] [PATCH wip-gnome 1/8] gnu: gtkmm@2: Remove inheritance from gtkmm@3 Maxime Devos
2021-04-27  9:29     ` Raghav Gururajan via Guix-patches via
2021-04-27  9:29     ` Raghav Gururajan via Guix-patches via
2021-04-26  9:08 ` [bug#48028] [PATCH wip-gnome v2 01/10] " Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 02/10] gnu: gtkmm: Change build-system Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 03/10] gnu: gtkmm: Add missing native-input and correct propagated-inputs Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` Raghav Gururajan via Guix-patches via [this message]
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 05/10] gnu: libsoup: Disable ssl-test Raghav Gururajan via Guix-patches via
2021-04-26 20:58     ` Maxime Devos
2021-04-27  9:33       ` Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 06/10] gnu: libsoup: Add missing argument and input Raghav Gururajan via Guix-patches via
2021-04-26 21:02     ` Maxime Devos
2021-04-27  9:34       ` Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 07/10] gnu: libsoup: Propagate glib-networking Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 08/10] gnu: libsoup: Update home-page Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 09/10] gnu: python-pycairo: Update to 1.20.0 Raghav Gururajan via Guix-patches via
2021-04-26  9:08   ` [bug#48028] [PATCH wip-gnome v2 10/10] gnu: python-pygobject: Update to 3.40.1 Raghav Gururajan via Guix-patches via
2021-04-26  9:22 ` [bug#48028] [PATCH wip-gnome v3 01/10] gnu: gtkmm@2: Remove inheritance from gtkmm@3 Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 02/10] gnu: gtkmm: Change build-system Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 03/10] gnu: gtkmm: Add missing native-input and correct propagated-inputs Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 04/10] gnu: libsoup: Simplify adjustment of tests Raghav Gururajan via Guix-patches via
2021-04-26  9:42     ` Leo Prikler
2021-04-26 10:31       ` Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 05/10] gnu: libsoup: Disable ssl-test Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 06/10] gnu: libsoup: Add missing input Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 07/10] gnu: libsoup: Propagate glib-networking Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 08/10] gnu: libsoup: Update home-page Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 09/10] gnu: python-pycairo: Update to 1.20.0 Raghav Gururajan via Guix-patches via
2021-04-26  9:22   ` [bug#48028] [PATCH wip-gnome v3 10/10] gnu: python-pygobject: Update to 3.40.1 Raghav Gururajan via Guix-patches via
2021-04-26 10:28 ` [bug#48028] [PATCH wip-gnome v4 1/8] gnu: gtkmm@2: Remove inheritance from gtkmm@3 Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 2/8] gnu: gtkmm: Change build-system Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 3/8] gnu: gtkmm: Add missing native-input and correct propagated-inputs Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 4/8] gnu: libsoup: Disable ssl-test Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 5/8] gnu: libsoup: Adjust inputs Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 6/8] gnu: libsoup: Update home-page Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 7/8] gnu: python-pycairo: Update to 1.20.0 Raghav Gururajan via Guix-patches via
2021-04-26 10:28   ` [bug#48028] [PATCH wip-gnome v4 8/8] gnu: python-pygobject: Update to 3.40.1 Raghav Gururajan via Guix-patches via
2021-04-26 21:08   ` [bug#48028] [PATCH wip-gnome v4 1/8] gnu: gtkmm@2: Remove inheritance from gtkmm@3 Maxime Devos
2021-04-27  9:23 ` [bug#48028] [PATCH wip-gnome v5 1/8] gnu: gtkmm: Change build-system and adjust arguments accordingly Raghav Gururajan via Guix-patches via
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 2/8] gnu: gtkmm@2: Override inheritance of certain changes from gtkmm Raghav Gururajan via Guix-patches via
2021-04-27 17:42     ` Maxime Devos
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 3/8] gnu: gtkmm: Add missing native-input and correct propagated-inputs Raghav Gururajan via Guix-patches via
2021-04-27 17:43     ` Maxime Devos
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 4/8] gnu: libsoup: Disable ssl-test Raghav Gururajan via Guix-patches via
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 5/8] gnu: libsoup: Adjust inputs Raghav Gururajan via Guix-patches via
2021-04-28  7:41     ` Leo Prikler
2021-04-28 13:07       ` Raghav Gururajan via Guix-patches via
2021-04-28 14:40         ` Leo Prikler
2021-05-02  5:14           ` [bug#48028] [PATCH wip-gnome 0/8]: Misc 宋文武
2021-05-02  7:03             ` Leo Prikler
2021-05-03  3:32               ` 宋文武
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 6/8] gnu: libsoup: Update home-page Raghav Gururajan via Guix-patches via
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 7/8] gnu: python-pycairo: Update to 1.20.0 Raghav Gururajan via Guix-patches via
2021-04-27  9:23   ` [bug#48028] [PATCH wip-gnome v5 8/8] gnu: python-pygobject: Update to 3.40.1 Raghav Gururajan via Guix-patches via
2021-05-07 21:23 ` bug#48028: (no subject) Raghav Gururajan via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210426090823.30672-4-rg@raghavgururajan.name \
    --to=guix-patches@gnu.org \
    --cc=48028@debbugs.gnu.org \
    --cc=rg@raghavgururajan.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).