02/13: pack: Adjust test to expect relative symlinks.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit ccc951cab3172adfdaf6fd2dfa8f8cdb98358a69
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 1 15:17:41 2018 +0200

    pack: Adjust test to expect relative symlinks.
    
    Reported by Chris Marusich <address@hidden>.
    Fixes <https://bugs.gnu.org/31560>.
    
    * tests/pack.scm ("self-contained-tarball"): Rename 'guile' to 'bin'.
    Expect 'bin/Guile' to be a relative symlink.
---
 tests/pack.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/pack.scm b/tests/pack.scm
index fcc53d1..d4596f8 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 <address@hidden>
+;;; Copyright © 2017, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; 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))))