From patchwork Tue Oct 12 16:03:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 33797 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 8992227BBE3; Tue, 12 Oct 2021 17:05:14 +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_H2,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 EA6EB27BBE1 for ; Tue, 12 Oct 2021 17:05:13 +0100 (BST) Received: from localhost ([::1]:55346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maKHA-0000Pi-Ne for patchwork@mira.cbaines.net; Tue, 12 Oct 2021 12:05:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maKG2-0007X9-Um for guix-patches@gnu.org; Tue, 12 Oct 2021 12:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maKG2-0000JL-IS for guix-patches@gnu.org; Tue, 12 Oct 2021 12:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1maKG2-0002lW-El for guix-patches@gnu.org; Tue, 12 Oct 2021 12:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51165] [PATCH core-updates-frozen] gnu: glib: Skip =?utf-8?b?4oCYdGVzdGZpbGVtb25pdG9y4oCZ?= test. Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Oct 2021 16:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51165 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51165@debbugs.gnu.org Cc: Thiago Jung Bauermann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163405462210594 (code B ref -1); Tue, 12 Oct 2021 16:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Oct 2021 16:03:42 +0000 Received: from localhost ([127.0.0.1]:50143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1maKFi-0002kn-0n for submit@debbugs.gnu.org; Tue, 12 Oct 2021 12:03:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:56398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1maKFf-0002kf-88 for submit@debbugs.gnu.org; Tue, 12 Oct 2021 12:03:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maKFe-0007CK-Ua for guix-patches@gnu.org; Tue, 12 Oct 2021 12:03:38 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:52282) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maKFb-0008Pr-Kn for guix-patches@gnu.org; Tue, 12 Oct 2021 12:03:37 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 24324BB8 for ; Tue, 12 Oct 2021 18:03:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1634054610; x=1635869011; bh=yDoCH0xrlDKDR+267d+Xxh6MG2GC0AJh/saobkZFIMU=; b=xI+FyKU/Flb4 xkxTvNdLY6TP8yrSDdgXuRTlH14QPpLNI7WxA0/iotn9KKWA5Ls0i036mtxgrkbc B6QHmJlWMl3q/ALaebEs2HYmLnmB0u1Jr6kFBwc7xg+rGHZN6KYZgUCHpTbc3y6O ExyeDO8TBKkWQUr2YG2yGutNN9Vlvj/MjIgwQHaJJvxKOR5WX9ML6b+WwioJPZG+ EMMQvKCBy/+S4uyGrFLgynGbIa390RgWQpKlQGdG4J+cwwacKpVJ364jMSXJBiCM us75CeWptx0UsC/EGCJqjiwO0+CIA/iWtwj7BnLVvV2Rhe0xpqA//0f0FFehUZae DplC5v95rzv8h7pJUiWqpWWZhWzpj8xzip4ucZaS4cyD/1g1Q+Bk5sIlV8xFVYI6 EsUm+aQXkQnZaDFISiV5eX72lwGe8q7iP3w85rBZ4r0QxB/g/N1ZqcAA8qEaVvhG UYYLAcI9gZr6xB80yy4OJZdx2PMyBmY3FzQr8ysYy6kSo3kU5MEvIdG5GoasDL9P 8f154P99DLsvsNKBHZcNRnEbrxROPzdCLfsLJ3Nffn4usvlBrvTzmbcSzvH7+Lis HaTz8hAR5BmIvxZIObe4VfESL7ITwfyAOxfML/4mgpk4W67UBEDbTnUC12R6/0TK qqq9B8QYBh9LQYOevGqr6h0a24zplm4= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y_9FbpJP2bCU for ; Tue, 12 Oct 2021 18:03:30 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id 176AD17E for ; Tue, 12 Oct 2021 18:03:28 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 8C02C860C8; Tue, 12 Oct 2021 18:03:28 +0200 (CEST) Date: Tue, 12 Oct 2021 13:03:12 -0300 Message-Id: <20211012160312.158351-1-bauermann@kolabnow.com> MIME-Version: 1.0 Received-SPF: pass client-ip=95.128.36.42; envelope-from=bauermann@kolabnow.com; helo=mx.kolabnow.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches On powerpc64le-linux, it fails approximately 2 out of 3 times. On x86_64 it also fails every now and then, at least on glib’s CI. * gnu/packages/patches/glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add new patch. * gnu/packages/glib.scm: Use it. --- Hello, Since glib was recently updated on core-updates frozen, it stopped building on powerpc64le-linux because of this test failure. I noticed the issue while testing `guix pull` from the branch and the pull failed due to this problem. It turns out Debian has a patch addressing exactly this, so let’s use it too. Unfortunately, `guix pull` still fails on powerpc64le-linux because the Guix package recently started to depend on MariaDB, which unfortunately I t think never built successfuly on this platform due to testsuite failures. gnu/local.mk | 1 + gnu/packages/glib.scm | 3 +- ...-Skip-if-we-are-avoiding-flaky-tests.patch | 111 ++++++++++++++++++ 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index dfb9e50b7369..e4d66c833643 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1124,6 +1124,7 @@ dist_patch_DATA = \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ + %D%/packages/patches/glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.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 6373fd0da9d1..9fc46b2101b1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -190,7 +190,8 @@ shared NFS home directories.") (base32 "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7")) (patches (search-patches "glib-appinfo-watch.patch" - "glib-skip-failing-test.patch")) + "glib-skip-failing-test.patch" + "glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch b/gnu/packages/patches/glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch new file mode 100644 index 000000000000..3feaa75bd0e7 --- /dev/null +++ b/gnu/packages/patches/glib-testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch @@ -0,0 +1,111 @@ +On powerpc64le-linux, testfilemonitor fails approximately 2 out of 3 times. +Patch obtained from: + +https://sources.debian.org/patches/glib2.0/2.66.8-1/debian/testfilemonitor-Skip-if-we-are-avoiding-flaky-tests.patch/ + +From: Simon McVittie +Date: Tue, 25 Feb 2020 10:45:07 +0000 +Subject: testfilemonitor: Skip if we are avoiding flaky tests + +See https://gitlab.gnome.org/GNOME/glib/issues/1634 + +Signed-off-by: Simon McVittie +Forwarded: no +--- + gio/tests/testfilemonitor.c | 34 +++++++++++++++++++++++++++++++++- + 1 file changed, 33 insertions(+), 1 deletion(-) + +diff --git a/gio/tests/testfilemonitor.c b/gio/tests/testfilemonitor.c +index b74dc2b..79b5776 100644 +--- a/gio/tests/testfilemonitor.c ++++ b/gio/tests/testfilemonitor.c +@@ -21,6 +21,12 @@ setup (Fixture *fixture, + gchar *path = NULL; + GError *local_error = NULL; + ++ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL) ++ { ++ g_test_skip ("https://gitlab.gnome.org/GNOME/glib/issues/1634"); ++ return; ++ } ++ + path = g_dir_make_tmp ("gio-test-testfilemonitor_XXXXXX", &local_error); + g_assert_no_error (local_error); + +@@ -37,7 +43,9 @@ teardown (Fixture *fixture, + { + GError *local_error = NULL; + +- g_file_delete (fixture->tmp_dir, NULL, &local_error); ++ if (fixture->tmp_dir != NULL) ++ g_file_delete (fixture->tmp_dir, NULL, &local_error); ++ + g_assert_no_error (local_error); + g_clear_object (&fixture->tmp_dir); + } +@@ -360,6 +368,10 @@ test_atomic_replace (Fixture *fixture, + GError *error = NULL; + TestData data; + ++ /* respect g_test_skip() during setup() */ ++ if (g_test_failed ()) ++ return; ++ + data.step = 0; + data.events = NULL; + +@@ -465,6 +477,10 @@ test_file_changes (Fixture *fixture, + GError *error = NULL; + TestData data; + ++ /* respect g_test_skip() during setup() */ ++ if (g_test_failed ()) ++ return; ++ + data.step = 0; + data.events = NULL; + +@@ -582,6 +598,10 @@ test_dir_monitor (Fixture *fixture, + GError *error = NULL; + TestData data; + ++ /* respect g_test_skip() during setup() */ ++ if (g_test_failed ()) ++ return; ++ + data.step = 0; + data.events = NULL; + +@@ -679,6 +699,10 @@ test_dir_non_existent (Fixture *fixture, + TestData data; + GError *error = NULL; + ++ /* respect g_test_skip() during setup() */ ++ if (g_test_failed ()) ++ return; ++ + data.step = 0; + data.events = NULL; + +@@ -788,6 +812,10 @@ test_cross_dir_moves (Fixture *fixture, + GError *error = NULL; + TestData data[2]; + ++ /* respect g_test_skip() during setup() */ ++ if (g_test_failed ()) ++ return; ++ + data[0].step = 0; + data[0].events = NULL; + +@@ -957,6 +985,10 @@ test_file_hard_links (Fixture *fixture, + GError *error = NULL; + TestData data; + ++ /* respect g_test_skip() during setup() */ ++ if (g_test_failed ()) ++ return; ++ + g_test_bug ("755721"); + + #ifdef HAVE_LINK