all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Tomas Volf <~@wolfsden.cz>
To: 67557@debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [bug#67557] [PATCH v2 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19.
Date: Sat,  2 Dec 2023 00:15:13 +0100	[thread overview]
Message-ID: <d8b960bb05ea05ac21c44f8511f3bf5ed92cabc8.1701472517.git.~@wolfsden.cz> (raw)
In-Reply-To: <cover.1701386073.git.~@wolfsden.cz>

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

base-commit: bdbb9dc27a590b08651d058f06a42caa26e04abb
--
2.41.0




  parent reply	other threads:[~2023-12-01 23:18 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-30 23:19 [bug#67558] [PATCH 0/5] Update libtorrent-rasterbar and dependent programs Tomas Volf
2023-12-01 12:14 ` [bug#67557] [PATCH 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19 Tomas Volf
2023-12-01 12:14 ` [bug#67557] [PATCH 2/5] gnu: deluge: Update to 2.1.1 Tomas Volf
2023-12-01 12:14 ` [bug#67557] [PATCH 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10 Tomas Volf
2023-12-01 12:14 ` [bug#67557] [PATCH 4/5] gnu: qbittorrent: Update to 4.6.2 Tomas Volf
2023-12-01 12:14 ` [bug#67557] [PATCH 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9 Tomas Volf
2023-12-01 23:15 ` Tomas Volf [this message]
2023-12-01 23:15   ` [bug#67557] [PATCH v2 2/5] gnu: deluge: Update to 2.1.1 Tomas Volf
2023-12-01 23:15   ` [bug#67557] [PATCH v2 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10 Tomas Volf
2023-12-01 23:15   ` [bug#67557] [PATCH v2 4/5] gnu: qbittorrent: Update to 4.6.2 Tomas Volf
2023-12-01 23:15   ` [bug#67557] [PATCH v2 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9 Tomas Volf
2023-12-02  0:28 ` [bug#67557] [PATCH v3 1/5] gnu: libtorrent-rasterbar: Update to 1.2.19 Tomas Volf
2023-12-02  0:28   ` [bug#67557] [PATCH v3 2/5] gnu: deluge: Update to 2.1.1 Tomas Volf
2023-12-02  0:28   ` [bug#67557] [PATCH v3 3/5] gnu: qbittorrent-enhanced: Update to 4.6.1.10 Tomas Volf
2023-12-02  0:28   ` [bug#67557] [PATCH v3 4/5] gnu: qbittorrent: Update to 4.6.2 Tomas Volf
2023-12-02  0:28   ` [bug#67557] [PATCH v3 5/5] gnu: libtorrent-rasterbar: Update to 2.0.9 Tomas Volf
2023-12-06 22:49 ` bug#67557: [PATCH 0/5] Update libtorrent-rasterbar and dependent programs Ludovic Courtès
2023-12-07 15:31   ` [bug#67557] " Tomas Volf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='d8b960bb05ea05ac21c44f8511f3bf5ed92cabc8.1701472517.git.~@wolfsden.cz' \
    --to=~@wolfsden.cz \
    --cc=67557@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.