efraim pushed a commit to branch master
in repository guix.
commit fc7fc13716c9be03e2123b09d629c2e5e1328330
Author: Efraim Flashner <[email protected]>
AuthorDate: Sun May 8 12:53:52 2022 +0300
gnu: tor: Only run sandbox tests on some architectures.
* gnu/packages/tor.scm (tor)[arguments]: Adjust custom 'adjust-test-suite
phase to upstream code changes. Use phase on more architectures.
---
gnu/packages/tor.scm | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index abc33fb68b..277acf4754 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2021 Ludovic Courtès <[email protected]>
;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]>
-;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner
<[email protected]>
+;;; Copyright © 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner
<[email protected]>
;;; Copyright © 2016, 2017 Nikita <[email protected]>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2017, 2018, 2019, 2021 Eric Bavier <[email protected]>
@@ -77,18 +77,21 @@
;; This is a style linter. It doesn't get to throw fatal
errors.
(lambda _
(setenv "TOR_DISABLE_PRACTRACKER" "set")))
- #$@(if (or (target-aarch64?)
- (target-ppc32?))
- ;; Work around upstream issue relating to sandboxing and
glibc-2.33.
- ;; This is similar to the issue the tor-sandbox-i686
patch fixes
- ;; but for other architectures.
+ #$@(if (or (target-x86-64?)
+ (target-x86-32?))
+ '()
+ ;; Work around upstream issues relating to libseccomp,
+ ;; sandboxing and glibc-2.33. This is similar to the
issue
+ ;; the tor-sandbox-i686 patch fixes but for other
architectures.
;;
https://gitlab.torproject.org/tpo/core/tor/-/issues/40381
+ ;;
https://gitlab.torproject.org/tpo/core/tor/-/issues/40599
;;
https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446
`((add-before 'check 'adjust-test-suite
(lambda _
(substitute* "src/test/test_include.sh"
- ((".*Sandbox 1.*") "")))))
- '()))))
+ ((".*Sandbox 1.*") ""))
+ (substitute* "src/test/test.c"
+ ((".*sandbox_tests.*") "")))))))))
(native-inputs
(list pkg-config python)) ; for tests
(inputs
