diff options
| author | Pierre Langlois <pierre.langlois@gmx.com> | 2021-12-22 22:02:08 +0000 |
|---|---|---|
| committer | Chris Marusich <cmmarusich@gmail.com> | 2022-01-16 20:21:27 -0800 |
| commit | 24c3485bb3ffc05e687ef6513ac287b8d3048bab (patch) | |
| tree | 7a3660cf32af30695d068614eff98d75a8a7a815 | |
| parent | 3b6755defe44c4795e134a46a7ef7b6009146872 (diff) | |
| download | guix-patches-24c3485bb3ffc05e687ef6513ac287b8d3048bab.tar guix-patches-24c3485bb3ffc05e687ef6513ac287b8d3048bab.tar.gz | |
tests: Fix file-needed/recursive on aarch64-linux.base-for-series-10996base-for-series-10995
Fixes: <https://issues.guix.gnu.org/52943>.
* tests/gremlin.scm (file-needed/recursive)[ground-truth]: On aarch64-linux,
remove the dynamic linker from this list.
| -rw-r--r-- | tests/gremlin.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/gremlin.scm b/tests/gremlin.scm index 9e0017337a..3dbb8d3643 100644 --- a/tests/gremlin.scm +++ b/tests/gremlin.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2018, 2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2022 Chris Marusich <cmmarusich@gmail.com> +;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,9 +21,11 @@ (define-module (test-gremlin) #:use-module (guix elf) #:use-module (guix tests) - #:use-module ((guix utils) #:select (call-with-temporary-directory)) + #:use-module ((guix utils) #:select (call-with-temporary-directory + target-aarch64?)) #:use-module (guix build utils) #:use-module (guix build gremlin) + #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -99,7 +102,12 @@ (or (string-prefix? "linux-vdso.so" entry) (string-prefix? "linux-vdso32.so" entry) ;32-bit powerpc (string-prefix? "linux-vdso64.so" entry) ;64-bit powerpc - (string-prefix? "linux-gate.so" entry))) ;i386 + (string-prefix? "linux-gate.so" entry) ;i386 + ;; FIXME: ELF files on aarch64 do not always include a + ;; NEEDED entry for the dynamic linker, and it is unclear + ;; if that is OK. See: https://issues.guix.gnu.org/52943 + (and (target-aarch64?) + (string-contains entry (glibc-dynamic-linker))))) (read-ldd-output pipe))) (and (zero? (close-pipe pipe)) |