From patchwork Fri Dec 1 23:15:13 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: 57194 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 ACD2617182; Fri, 1 Dec 2023 23:18:49 +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 885E416FAA for ; Fri, 1 Dec 2023 23:18:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Clm-0004qw-4M; Fri, 01 Dec 2023 18:18:02 -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 1r9Clf-0004p4-1A for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17: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 1r9Cle-0008CI-Pc for guix-patches@gnu.org; Fri, 01 Dec 2023 18:17:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Cln-0005LT-Nq for guix-patches@gnu.org; Fri, 01 Dec 2023 18:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v2 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 23:18: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.170147262320449 (code B ref 67557); Fri, 01 Dec 2023 23:18:03 +0000 Received: (at 67557) by debbugs.gnu.org; 1 Dec 2023 23:17:03 +0000 Received: from localhost ([127.0.0.1]:56339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Cko-0005Jg-Hz for submit@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:02 -0500 Received: from wolfsden.cz ([37.205.8.62]:42434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Ckh-0005IJ-PQ for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 18:17:00 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0A7672603E1; Fri, 1 Dec 2023 23:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472605; bh=sQ8I9EYzgafVf7osiSuLyfvj4HQQDISqR+x2kwJ8TNM=; h=From:To:Cc:Subject:Date; b=LX1JyRINyr9i/01H6kp9rMpLSL/ekcoo90gFQFgTAfLOzw26dU2r79wHMn+x/xEce /avL1WMLs3gIYFUz/hUzoEhC4H9HOrjC1VraEYhWwpouTSyH8ECBEovCgowAUvuhjl 1gFVWEs3KMFdXjARZj0BVZYbv2KHHWLpMtVYGu2YgPdG/rYQkUuJ740YlhKhuAeQur i4mBWn0MC8VtB1JTF48U2/4XLTbY3TpU84LKUbox5PQEaSy+yqbEW0CYON/g+DC1/f 4QMCXzqdet5hWV2dCODJwNXyJ3KFOGisvGCOiV9RXdjjFy3gTP1UUbPLb+jthGfvcM NgOgI6jUtyJSP5LjdY92nMxG3FoeH2SIvxn/HLSIpBIACM397ouBT+NAtjZTHS7P56 iUpG/qY/lJs3+t+Kl4zAtBITv3TaQRMhv8thes0GyXXZQj3ma9pt+u76qjEPfvAOU1 fS5t3dOYQ4NI3hjt96BqrKKzS1OGgyCuiughr4IgBBRADgmkrfNoCkRIgp/KtjbPiJ T1V/1pI7hVWljx/OojbtXRz9CvYpDd4pbkZEV6ZBswfrOxlcRRNls47ahL6BwOTHhw BN3NLxPbzRWjImYAFtlwdoZZ8t0/jcNmM1j3eCcRQKKBIhbxYwSgSUEeWjW8IjaMgx L6Ta84gHiAwYnBHQ9vrYquok= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 72B2026271E; Fri, 1 Dec 2023 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701472604; bh=sQ8I9EYzgafVf7osiSuLyfvj4HQQDISqR+x2kwJ8TNM=; h=From:To:Cc:Subject:Date; b=vHjLNobnJhSXBme6k596PynGAmM8tb7xViT4eysI8duQWGdei3LvlFQAUdJ9++1Jz G8fT425FzEGUbxrfHYNzErc+S/BnnKBgTmjR753FIZvQYovJ648Umg1//RLKwYg1SY KduTGo4R4PaVRQWnVFNYdTwCSaPLiRKWM7af9X+75kv1Y969+aai42oWtK1SeIjHVQ zWLlXrKyZCxmdGA9DiB8grh3mwCjjL7t4LL8twtH4TcLF6dxQ6rM8shuh3DhR/iByw e6TImll7tIKipf9hL7AUiDvJGtHjka9nWO/3fMEPIBh5ZWmMMSdX0D7XeWWmKoBozO 9biNBhumvsVRiP8vgxDWu1XmaNuTVeIUfA9pEpIrAu4MyipkJeO4+7IquNBh/HHMl/ Dz0wVkVHiu8lepWu2YJ15ob35FlLIa1bQ+AqfSO3CnmpmRBQfkLYt5ws7gCOTDGwsm IWJdZhXbJxP98ScJCfD4FoaLeLjeWIiX7HSd0hXlmuKSEiyqRxJ2uf7mKlok5NqH/Z imP0y4EEJR/dMLhDSupcqEB0IR/7HY6445mND5pnCzeIF/J+Sys56EIGfbZX6vOmZM cJeLtkpEl2oTA+uxmMRKN16vIp7IZLQVDRM0xTsYCLmlbCqL4F6O2WqzOzHCeQpSL0 hZCqRY3xhfVjFny4mbEYtF+g= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6a53c904; Fri, 1 Dec 2023 23:16:43 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 00:15:13 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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-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(-) base-commit: bdbb9dc27a590b08651d058f06a42caa26e04abb -- 2.41.0 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