[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/26: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty.
From: |
guix-commits |
Subject: |
18/26: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty. |
Date: |
Sun, 7 Mar 2021 22:00:17 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit 1bc3feeb2b5484381138e4ab9fd1697da26f4dca
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Wed Feb 24 00:02:30 2021 -0800
tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty.
* tests/gremlin.scm (file-needed/recursive): Skip the test when
(file-runpath
%guile-executable) evaluates to the empty list. This fixes the test, which
previously failed incorrectly in the case where Guix has been built using a
foreign distro's toolchain and libraries.
---
tests/gremlin.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/gremlin.scm b/tests/gremlin.scm
index 9ddac14..79abdaf 100644
--- a/tests/gremlin.scm
+++ b/tests/gremlin.scm
@@ -61,7 +61,11 @@
(elf-dynamic-info-needed dyninfo))))))
(unless (and %guile-executable (not (getenv "LD_LIBRARY_PATH"))
- (file-needed %guile-executable)) ;statically linked?
+ (file-needed %guile-executable) ;statically linked?
+ ;; When Guix has been built on a foreign distro, using a
+ ;; toolchain and libraries from that foreign distro, it is not
+ ;; unusual for the runpath to be empty.
+ (pair? (file-runpath %guile-executable)))
(test-skip 1))
(test-assert "file-needed/recursive"
(let* ((needed (file-needed/recursive %guile-executable))
- 12/26: gnu: libelf: Fix compilation for powerpc64le-linux., (continued)
- 12/26: gnu: libelf: Fix compilation for powerpc64le-linux., guix-commits, 2021/03/07
- 15/26: syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux., guix-commits, 2021/03/07
- 23/26: gnu: openjpeg: Disable failing tests group., guix-commits, 2021/03/07
- 24/26: gnu: rust: Make it "supported" on all systems but i686-linux., guix-commits, 2021/03/07
- 25/26: tests: guix-environment.sh: Use C_INCLUDE_PATH, not CPATH., guix-commits, 2021/03/07
- 10/26: gnu: texlive-bin: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 13/26: Add powerpc64le-linux as a supported Guix architecture., guix-commits, 2021/03/07
- 14/26: syscalls: Fix clone on powerpc64le-linux., guix-commits, 2021/03/07
- 16/26: ci: %cross-targets: Add powerpc64le-linux-gnu., guix-commits, 2021/03/07
- 17/26: utils: Fix target-64bit? on powerpc64le-linux., guix-commits, 2021/03/07
- 18/26: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty.,
guix-commits <=
- 19/26: tests: pack: Fix %gzip-compressor and a failing test., guix-commits, 2021/03/07
- 20/26: gnu: commencement: Fix findutils-boot0 on some systems., guix-commits, 2021/03/07
- 21/26: gnu: gcc: Set gcc-8 as default., guix-commits, 2021/03/07
- 22/26: .guix-authorizations: Add lle_bout., guix-commits, 2021/03/07
- 26/26: gnu: emacs: Use librsvg and gtk+ on x86_64-linux only., guix-commits, 2021/03/07