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)
downloadpatches-ccc951cab3172adfdaf6fd2dfa8f8cdb98358a69.tar
patches-ccc951cab3172adfdaf6fd2dfa8f8cdb98358a69.tar.gz
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 fcc53d12ef..d4596f863a 100644
--- a/tests/pack.scm
+++ b/tests/pack.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
@@ -65,17 +65,17 @@
#:archiver %tar-bootstrap))
(check (gexp->derivation
"check-tarball"
- #~(let ((guile (string-append "." #$profile "/bin")))
+ #~(let ((bin (string-append "." #$profile "/bin")))
(setenv "PATH"
(string-append #$%tar-bootstrap "/bin"))
(system* "tar" "xvf" #$tarball)
(mkdir #$output)
(exit
- (and (file-exists? (string-append guile "/guile"))
+ (and (file-exists? (string-append bin "/guile"))
(string=? (string-append #$%bootstrap-guile "/bin")
- (readlink guile))
- (string=? (string-append (string-drop guile 1)
- "/guile")
+ (readlink bin))
+ (string=? (string-append ".." #$profile
+ "/bin/guile")
(readlink "bin/Guile"))))))))
(built-derivations (list check))))