summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-01 15:17:41 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-01 15:17:41 +0200
commitccc951cab3172adfdaf6fd2dfa8f8cdb98358a69 (patch)
tree0da7dd214ba15a677fa18ee07516dcd10663f574 /tests
parent44057a461b1fa8102938c4e0f54d7cbc9dd09b03 (diff)
pack: Adjust test to expect relative symlinks.
Reported by Chris Marusich <cmmarusich@gmail.com>. Fixes <https://bugs.gnu.org/31560>. * tests/pack.scm ("self-contained-tarball"): Rename 'guile' to 'bin'. Expect 'bin/Guile' to be a relative symlink.
Diffstat (limited to 'tests')
-rw-r--r--tests/pack.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/pack.scm b/tests/pack.scm
index fcc53d12ef5..d4596f863ae 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> 3;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
4;;; 4;;;
5;;; This file is part of GNU Guix. 5;;; This file is part of GNU Guix.
@@ -65,17 +65,17 @@
65 #:archiver %tar-bootstrap)) 65 #:archiver %tar-bootstrap))
66 (check (gexp->derivation 66 (check (gexp->derivation
67 "check-tarball" 67 "check-tarball"
68 #~(let ((guile (string-append "." #$profile "/bin"))) 68 #~(let ((bin (string-append "." #$profile "/bin")))
69 (setenv "PATH" 69 (setenv "PATH"
70 (string-append #$%tar-bootstrap "/bin")) 70 (string-append #$%tar-bootstrap "/bin"))
71 (system* "tar" "xvf" #$tarball) 71 (system* "tar" "xvf" #$tarball)
72 (mkdir #$output) 72 (mkdir #$output)
73 (exit 73 (exit
74 (and (file-exists? (string-append guile "/guile")) 74 (and (file-exists? (string-append bin "/guile"))
75 (string=? (string-append #$%bootstrap-guile "/bin") 75 (string=? (string-append #$%bootstrap-guile "/bin")
76 (readlink guile)) 76 (readlink bin))
77 (string=? (string-append (string-drop guile 1) 77 (string=? (string-append ".." #$profile
78 "/guile") 78 "/bin/guile")
79 (readlink "bin/Guile")))))))) 79 (readlink "bin/Guile"))))))))
80 (built-derivations (list check)))) 80 (built-derivations (list check))))
81 81