From patchwork Sat Dec 2 00:28:54 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: 57199 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 5FAA227BBEA; Sat, 2 Dec 2023 00:31:45 +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 8DD1B27BBE2 for ; Sat, 2 Dec 2023 00:31:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9DuT-0007la-Cn; Fri, 01 Dec 2023 19:31:05 -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 1r9DuM-0007hp-Ff for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:00 -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 1r9DuJ-0007UI-Ip for guix-patches@gnu.org; Fri, 01 Dec 2023 19:30:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9DuS-0007Q3-FI for guix-patches@gnu.org; Fri, 01 Dec 2023 19:31:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67557] [PATCH v3 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: Sat, 02 Dec 2023 00:31:04 +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.170147702128440 (code B ref 67557); Sat, 02 Dec 2023 00:31:04 +0000 Received: (at 67557) by debbugs.gnu.org; 2 Dec 2023 00:30:21 +0000 Received: from localhost ([127.0.0.1]:56397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtl-0007OZ-60 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:21 -0500 Received: from wolfsden.cz ([37.205.8.62]:49394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Dtf-0007NW-Kr for 67557@debbugs.gnu.org; Fri, 01 Dec 2023 19:30:18 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id C7C582628A4; Sat, 2 Dec 2023 00:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477004; bh=H1DkL1YIfVU6GbWe/hpGyXdbWIiW3eNmlVpVBhDwABo=; h=From:To:Cc:Subject:Date; b=vkWXrZxVLMOwvoA/uL3VdNuFYHr8hCAxHmxczn7CKTu8UBLFGqbF3Gh0MgKsd0B6C 6RB0kyzDlXuYXFyADCpYhEFGedQP/rUs2fCf7m96i735GNLJWOHXIAfSwbkMKxwx0Q 2RSf5+PXTRBuEptuQqDFSaf05v42XUuGxBXudGhxvmyqZdkTRUK/RIJmGLTk8kDh9E Q81EvfW0WaD2O8jIhrYZTbAPRkggYoh7q0gYZTd2FRdOiPVYt6Wmtw5pUOumJBo19K erFvk53G2EDAu6k/W6PMmfCKyVr6J7iYFKm94iGYREBZS1oXR3Nyyvjqh4RNDIBcT9 3mFNwBzrCm8e1ch1wJLPW1jwEtutgLQBNcUrTvY1aFu8hh9fFelg9MTtvEezUoDAwc mTyrPXz8wQWu2KR9Hd9sVnsEtHAUlUMLQdfsF44Et1nADqHT9IXA4n1msTs3U5n2Ti 9iOEay3oCDmKG3sOYVUVMCb1q0G7xFl8KuSA+lAhViM5/OFE5kNEvp+sC26zK5uIIS 8uzJIVND5HuFyxc4fvEiBNzjVD8g73ZFfw0NZmgoUoHu0gaaEiHCJevRzP/6GjhYDz D+1Rqc13r7qJ9cnifwU7DO9ZY6YmlZbJmLpOxl/GVmE5EZKYQ82b05/LPXl+fBGw5l JdFZ2+BuktiOMGoq9CjKsKt4= Received: from localhost (unknown [193.32.127.144]) by wolfsden.cz (Postfix) with ESMTPSA id 148082603E3; Sat, 2 Dec 2023 00:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1701477003; bh=H1DkL1YIfVU6GbWe/hpGyXdbWIiW3eNmlVpVBhDwABo=; h=From:To:Cc:Subject:Date; b=s0leB/tqVEm/FW6oxhdzsM2Wh7p6C5+wo0AsGEZOf7UU3JkZh+RXiMiNdlYZczi1E HR4BBPq4vJjfU1pkVQUN4HLhWrJALUiSWchQqm8DMtUOlUk3P4ERx2ZUGS3hmiAGqa tKU69s5cL/tSmk6xSViYwZYBM9ZevblK0g1pzJnQQXaqIOUVzlniRTnFfsuZOAyDgT zJ0XrjzTXWF1R9vOzCAvDAi9/e9U8PKCCx3y7p6KzSnh0QxpHJUWz7WtP1TSyNuPZh 92cWsRWWA+mpG9m5DyVpNC0NbZIkS9kN5LKziH087oBeS37gO3byX6Ae+tDFZ1F9SN zW6LZ42oRN/gv+W1njK0ACCCTJUfvrCywVR0gWqMTZcUzr+eh2IZs9t93+pZtE8f0/ TJbhy+fXvKVMu0uKtMeo8xb9Npjg0HL/2y2hM2LJy3kdERNG4ddRtsTV/MDdJrNeMO ycv5NfiC39VGskMb+o6oRg9DsCfA74LgzWWZ8zJUrpBv9gBM6M5sxTeM/Zgre2BjT5 pKFXyRQoGX1tiLeAqDhSXdA10F4BAOx/S/rtjWa95O2L0XQd2OPCbf7MmVJzA7MpC9 /+RC13uyn35mV3lbDeeE4f8ibN9A1xtru3TGk2NY4fIPEAFgZoAvaAMEcdR/qMM3vV yMoPAe9iWTuihLP7iuoP3gQg= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id bbd2262f; Sat, 2 Dec 2023 00:30:01 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 2 Dec 2023 01:28:54 +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: 842a11f1caa1bb929c427722ad9d7b7c1ff65727 -- 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