diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-01 23:41:40 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-01 23:41:40 +0200 |
| commit | a13c1bf4ca0b15fa53235c2bd6aa53e4a75c7d0f (patch) | |
| tree | 8a19fb07861c685199beb9b8beb4f7d8f2a3d22a /tests/pack.scm | |
| parent | babeea3f9f46c1f1f812e590f46283e91684f327 (diff) | |
| parent | 1a3e3162acafd32ff2fb675f2f780d986692c52d (diff) | |
| download | gnu-guix-a13c1bf4ca0b15fa53235c2bd6aa53e4a75c7d0f.tar gnu-guix-a13c1bf4ca0b15fa53235c2bd6aa53e4a75c7d0f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/pack.scm')
| -rw-r--r-- | tests/pack.scm | 12 |
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)))) |