me
/
guix
Archived
1
0
Fork 0
Code

gremlin: Adjust tests for foreign distros. 

Fixes <https://bugs.gnu.org/35775>.

* tests/gremlin.scm ("elf-dynamic-info-needed, executable"): Expect only
libguile and libc among NEEDED.
("strip-runpath"): Pass '--enable-new-dtags' to get RUNPATH, not RPATH.
master
Ting-Wei Lan 2019-05-18 12:08:49 +02:00 committed by Ludovic Courtès
parent 1b0d2b2afc
commit 6b97415996
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/gremlin.scm
View File

@ -52,7 +52,7 @@
(or (not dyninfo) ;static executable (or (not dyninfo) ;static executable
(lset<= string=? (lset<= string=?
(list (string-append "libguile-" (effective-version)) (list (string-append "libguile-" (effective-version))
"libgc" "libunistring" "libffi") "libc")
(map (lambda (lib) (map (lambda (lib)
(string-take lib (string-contains lib ".so"))) (string-take lib (string-contains lib ".so")))
(elf-dynamic-info-needed dyninfo)))))) (elf-dynamic-info-needed dyninfo))))))
@ -79,7 +79,7 @@
(lambda (port) (lambda (port)
(display "int main () { puts(\"hello\"); }" port))) (display "int main () { puts(\"hello\"); }" port)))
(invoke c-compiler "t.c" (invoke c-compiler "t.c"
"-Wl,-rpath=/foo" "-Wl,-rpath=/bar") "-Wl,--enable-new-dtags" "-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
(let* ((dyninfo (elf-dynamic-info (let* ((dyninfo (elf-dynamic-info
(parse-elf (call-with-input-file "a.out" (parse-elf (call-with-input-file "a.out"
get-bytevector-all)))) get-bytevector-all))))