civodul pushed a commit to branch master
in repository guix.
commit e7ad192de008a6a21638def6eb973b9cc0c91116
Author: Ludovic Courtès <[email protected]>
AuthorDate: Fri Jan 14 16:42:25 2022 +0100
gremlin: Adjust tests for i686 and beyond.
Fixes <https://issues.guix.gnu.org/52752>.
Reported by Denis 'GNUtoo' Carikli <[email protected]>.
* tests/gremlin.scm ("file-needed/recursive"): Augment the list of vDSO
names.
---
tests/gremlin.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/gremlin.scm b/tests/gremlin.scm
index 41cefd9c7c..9e0017337a 100644
--- a/tests/gremlin.scm
+++ b/tests/gremlin.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2018, 2020 Ludovic Courtès <[email protected]>
+;;; Copyright © 2015, 2018, 2020, 2022 Ludovic Courtès <[email protected]>
;;; Copyright © 2022 Chris Marusich <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -94,8 +94,12 @@
(loop result))))))
(define ground-truth
(remove (lambda (entry)
+ ;; See vdso(7) for the list of vDSO names across
+ ;; architectures.
(or (string-prefix? "linux-vdso.so" entry)
- (string-prefix? "linux-vdso64.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
(read-ldd-output pipe)))
(and (zero? (close-pipe pipe))
