[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates updated: tests: gremlin: Skip file-needed/recursive
From: |
guix-commits |
Subject: |
branch core-updates updated: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty. |
Date: |
Wed, 23 Jun 2021 23:31:40 -0400 |
This is an automated email from the git hooks/post-receive script.
marusich pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new e4b5a23 tests: gremlin: Skip file-needed/recursive if DT_NEEDED is
empty.
e4b5a23 is described below
commit e4b5a23841bc6a92e2e21dd8b1038addee55eb02
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 causes the test to be
correctly skipped 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 f20a79f..9af899c 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates updated: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty.,
guix-commits <=