[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates-frozen updated: gnu: tor: Limit test suite adjustmen
From: |
guix-commits |
Subject: |
branch core-updates-frozen updated: gnu: tor: Limit test suite adjustments to affected architectures. |
Date: |
Thu, 02 Dec 2021 04:08:34 -0500 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch core-updates-frozen
in repository guix.
The following commit(s) were added to refs/heads/core-updates-frozen by this
push:
new e577889 gnu: tor: Limit test suite adjustments to affected
architectures.
e577889 is described below
commit e5778898288edcddc49db67d104ae76b8492da1f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Dec 2 10:37:54 2021 +0200
gnu: tor: Limit test suite adjustments to affected architectures.
This is a follow-up to 68d090002a1a5623494006fca3e2c2c97d3ff676.
* gnu/packages/tor.scm (tor)[arguments]: Only add custom
'adjust-test-suite phase on aarch64, powerpc32.
---
gnu/packages/tor.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index cb8fa7e..f0e3849 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -77,15 +77,18 @@
;; This is a style linter. It doesn't get to throw fatal errors.
(lambda _
(setenv "TOR_DISABLE_PRACTRACKER" "set")))
- (add-before 'check 'adjust-test-suite
- (lambda _
+ ,@(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.
;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40381
;; https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446
- (substitute* "src/test/test_include.sh"
- ((".*Sandbox 1.*") "")))))))
+ `((add-before 'check 'adjust-test-suite
+ (lambda _
+ (substitute* "src/test/test_include.sh"
+ ((".*Sandbox 1.*") "")))))
+ '()))))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python))) ; for tests
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates-frozen updated: gnu: tor: Limit test suite adjustments to affected architectures.,
guix-commits <=