From patchwork Fri Dec 1 12:14:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 57173 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 4D29F27BBEA; Fri, 1 Dec 2023 14:02:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 79CC027BBE2 for ; Fri, 1 Dec 2023 14:02:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r945f-0003kX-6F; Fri, 01 Dec 2023 09:01:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r945a-0003jZ-Mr for guix-patches@gnu.org; Fri, 01 Dec 2023 09:01:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r945a-0004wI-Ei for guix-patches@gnu.org; Fri, 01 Dec 2023 09:01:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r945j-0001f4-5T for guix-patches@gnu.org; Fri, 01 Dec 2023 09:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 14:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67557 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67557@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 67557-submit@debbugs.gnu.org id=B67557.17014392726269 (code B ref 67557); Fri, 01 Dec 2023 14:02:03 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 14:01:12 +0000 Received: from localhost ([127.0.0.1]:55312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r944t-0001cx-US for submit@debbugs.gnu.org; Fri, 01 Dec 2023 09:01:12 -0500 Received: from wolfsden.cz ([37.205.8.62]:40206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r92Q3-0004Oi-LI for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 07:14:59 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 431DE260A6F; Fri, 1 Dec 2023 12:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432885; bh=f0cASahPtFh/zEEdI3BA02Kf8/79o3TYCXUO3MaRdxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kWUBCleMi16lOhZwjwhQtEIj7d67t1L8uH56XRjsIFKhkec/U3bfjqaBO/H52mRQt vqPl+iZXgBA0JedULxU/XEtosrocRaKwdu1HLFOuNiLhL5wdAHB6POmRqoDiVzInLi ez9CL1KmTiQPO6WNnMCMEp7jW7qYj2BSzpKtGO3ZN3/0+eesDjZ3TF16kH8TrRAOcE qENIX8ARHFNHGQlmWp3b+B6xbT5/ZEkiF+5uqkGV4j/K/uZvoMsPGtYxm4tP8Jepfd +80RpeDsCgXZpUtwOTAm2ky2eDBxqPY/W3blHZVo0bsiJv6VDv/b2CfUivspi6xOq8 PYWny8S5xdJhyap4Q+ahHCvCOae+z9aUKPdQUiWHk5pY0qeyI6BneMzct8VA4JUXJ+ WPFWgFVBJ9GC2RzHNtYllzHYlnnlMQf0v5JuY588n4o+v/QtrH5QSRO+jU8ZciE1Rl b6Q/VvYtGdXXQsC7dEo9FC1TzBJs2JsKybuFfc54xoqayJcFndcfX0Bhf6hmE9pljr s7LaDOjjT+MUo0qHO7YCM57vIyuuNq5L1wzpdS5IiskxM3rzs7RcUiss9ohuVNh3H8 fL5p+Xz4prPc+oePE+ttEO5/KyQ+ZJ8+q0c4i2k8W61Iwp4MLXcE43YD3n7LU1CViT 05ULyP0587/Ghh941QD4mgCc= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id C5CF52615F0; Fri, 1 Dec 2023 12:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701432881; bh=f0cASahPtFh/zEEdI3BA02Kf8/79o3TYCXUO3MaRdxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JYmts3eq/RAYqfvtMlN34PNF695pznllA7/xeRz7NVelMG7NSX50df7wSHC0R6eGh fJ9Z9gD6GIkdRKTKXmg8oIS+4LWEasAI3yU8xLrfsC1YNIR/kJ/7Xo8XB8wP1f5B1t F2F5KtAG694gSRT6dE9/mCAx7uogdzmSa3xDIVfpggPMPjLqczUs514bjWpey7qO0k 6W4AfKeuc5H0ejcKLifc1eTuOAFZMXdIlWsc8RVacu0AnGk6dyh9HDQSNHw0EoKgn1 MHRnbh+kvPdZIqX5lP0xNyOYxB/vFTCWfj4eY708WT4NpG0nzlOIk4xE7I1nyHWHhW 4I2Pu2GZsYSxNObuqqMVra8sYV7me3XmOGkS6KCOeZ6aj56/3vKcs/UUNhMtkt9l44 AXp9ouwISzBfVjHpzzfUQW4Y2E0Luf6kbpAZoux3vLB0ztNxPin2fAvRfAs4E3HFEh /UXMbJ1F/Durmk/ambD1i8Qg2B2CaBs1DhfiLywZDl/Ne7B7ZRpjs9qckpCrGzyJb0 78uQXdJFW3VHMCjZic61EIYf/G2UvtMJ4+U3nU2IQmQNKeJgFHybInvsqpjJhZYAAo 08gxe9ZqqkTgUF17mcXh9w6GEwEp6t5ndBJyId5nVEsiA8KJbAtkvh59WDleA/6YQG ez34Z53+E7ErPGhZhj+IR24M= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 90b2f2d0; Fri, 1 Dec 2023 12:14:40 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Fri, 1 Dec 2023 13:14:33 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 01 Dec 2023 09:01:06 -0500 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches With the update, the execution of the test suite was overhauled a lot. Parallel tests were disabled, since the do not work well. Since faketime does cause some tests to hang, test_ssl was moved into a separate run. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[version]: Update to 1.2.19. [arguments]<#:parallel-tests?>: Disable. [arguments]<#:phases>: Move test_ssl into separate run under faketime. Do not run under tests under faketime. Anchor the regex for test exclusion. Set timeout of 600 seconds for each test. Change-Id: I7392cb3ce1a8815b26b3257498082761255535ee --- gnu/packages/bittorrent.scm | 46 ++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 6f75a92cff..e115c13017 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -417,7 +417,7 @@ (define-public mktorrent (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.18") + (version "1.2.19") (source (origin (method url-fetch) @@ -426,35 +426,49 @@ (define-public libtorrent-rasterbar "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'extend-test-timeout - (lambda _ - (substitute* "test/test_remove_torrent.cpp" - ;; Extend the test timeout from 3 seconds to 10. - (("i > 30") "i > 100")))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((disabled-tests - ;; test_upnp requires a non-localhost IPv4 interface. - '("test_upnp"))) + (let* ((disabled-tests + '( + ;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. - (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + ;; + ;; At the same time, faketime happens to cause + ;; test_fast_extension, test_privacy and test_resolve_links + ;; to hang, even with FAKETIME_ONLY_CMDS. Not sure why. So + ;; execute only test_ssl under faketime. (invoke "faketime" "2022-10-24" "ctest" - "--exclude-regex" (string-join disabled-tests "|") - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--rerun-failed" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) (native-inputs