From patchwork Thu Apr 22 07:59:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 28750 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 2457027BC7D; Thu, 22 Apr 2021 09:07:18 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 6BB1927BC7B for ; Thu, 22 Apr 2021 09:07:17 +0100 (BST) Received: from localhost ([::1]:56456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZUMm-0006Wl-LP for patchwork@mira.cbaines.net; Thu, 22 Apr 2021 04:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZUMZ-0006UC-OJ for guix-patches@gnu.org; Thu, 22 Apr 2021 04:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZUMY-0001qN-JT for guix-patches@gnu.org; Thu, 22 Apr 2021 04:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZUMY-0008Tc-D6 for guix-patches@gnu.org; Thu, 22 Apr 2021 04:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47615] [PATCH v2 12/12] gnu: glib: Disable failing test. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Apr 2021 08:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47615 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47615@debbugs.gnu.org, guix-devel@gnu.org Cc: Efraim Flashner Received: via spool by 47615-submit@debbugs.gnu.org id=B47615.161907882032569 (code B ref 47615); Thu, 22 Apr 2021 08:07:02 +0000 Received: (at 47615) by debbugs.gnu.org; 22 Apr 2021 08:07:00 +0000 Received: from localhost ([127.0.0.1]:60699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZUMO-0008T7-63 for submit@debbugs.gnu.org; Thu, 22 Apr 2021 04:06:59 -0400 Received: from flashner.co.il ([178.62.234.194]:43560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZUMN-0008Su-3u for 47615@debbugs.gnu.org; Thu, 22 Apr 2021 04:06:51 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 82E78403A4; Thu, 22 Apr 2021 08:06:45 +0000 (UTC) From: Efraim Flashner Date: Thu, 22 Apr 2021 10:59:25 +0300 Message-Id: <93d85718da0640eacf2e89567105ed42ba893d3c.1619076704.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.31.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (glib)[source]: Add patch. [arguments]: Remove custom 'increase-test-timeout phase. * gnu/packages/patches/glib-skip-failing-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 16 +++-------- .../patches/glib-skip-failing-test.patch | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/glib-skip-failing-test.patch I don't have a way to test this on native armhf or i686 but I tried changing the test timeout to 30 minutes (from the new default of 180 seconds) and it still timed out / hung forever. This is the minimal patch to skip that test. diff --git a/gnu/local.mk b/gnu/local.mk index 7aba045e4b..18fa325503 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1080,6 +1080,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ + %D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 34d2ba4cf4..ede4a06a08 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver -;;; Copyright © 2016, 2020 Efraim Flashner +;;; Copyright © 2016, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Petter @@ -187,7 +187,8 @@ shared NFS home directories.") (sha256 (base32 "1sh3h6b734cxhdd1qlzvhxq6rc7k73dsisap5y3s419s9xc4ywv7")) (patches - (search-patches "glib-appinfo-watch.patch")) + (search-patches "glib-appinfo-watch.patch" + "glib-skip-failing-test.patch")) (modules '((guix build utils))) (snippet '(begin @@ -203,17 +204,6 @@ shared NFS home directories.") #:configure-flags '("-Dman=true") #:phases (modify-phases %standard-phases - ;; TODO: Remove the conditional in the next core-updates cycle. - ;; Needed to build glib on slower ARM nodes. - ,@(if (string-prefix? "arm" (%current-system)) - `((add-after 'unpack 'increase-test-timeout - (lambda _ - (substitute* "meson.build" - (("test_timeout = 60") - "test_timeout = 90") - (("test_timeout_slow = 120") - "test_timeout_slow = 180"))))) - '()) (add-after 'unpack 'disable-failing-tests (lambda _ (with-directory-excursion "glib/tests" diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch new file mode 100644 index 0000000000..c7706aaa74 --- /dev/null +++ b/gnu/packages/patches/glib-skip-failing-test.patch @@ -0,0 +1,27 @@ +This test timed out on powerpc-linux even after extending the +test_timeout_slow to 1800 seconds. Previously we tried to work around +this test by extending test_timeout_slow by 1.5 its previous value. + +--- + gio/tests/meson.build | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index a926ae0..4fdbe7a 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -317,10 +317,6 @@ if host_machine.system() != 'windows' + 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], + 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], + }, +- 'gdbus-threading' : { +- 'extra_sources' : extra_sources, +- 'suite' : ['slow'], +- }, + 'gmenumodel' : { + 'extra_sources' : extra_sources, + 'suite' : ['slow'], + +-- +2.31.1 +