diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-01-30 21:33:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-01-30 22:24:06 +0100 |
| commit | 9d6fae65f3c2197e7b95afebd0a13908bdb4aed9 (patch) | |
| tree | 96c077b2d59ee60fc0bc9beaa8ec3b7771e256c2 /tests | |
| parent | 129332ab20feff510dc5f62c2a708b37a5b7ba24 (diff) | |
| download | patches-9d6fae65f3c2197e7b95afebd0a13908bdb4aed9.tar patches-9d6fae65f3c2197e7b95afebd0a13908bdb4aed9.tar.gz | |
derivations: Adjust tests for Stow environments.
Fixes <https://bugs.gnu.org/30250>.
Reported by Jorge <jorge+list@disroot.org>.
* tests/derivations.scm ("add-to-store, flat")
("add-to-store, recursive"): Call 'readlink*'.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/derivations.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index 36afd42d05..5d83529183 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,7 +96,10 @@ (test-skip (if %store 0 12)) (test-assert "add-to-store, flat" - (let* ((file (search-path %load-path "language/tree-il/spec.scm")) + ;; Use 'readlink*' in case spec.scm is a symlink, as is the case when Guile + ;; was installed with Stow. + (let* ((file (readlink* + (search-path %load-path "language/tree-il/spec.scm"))) (drv (add-to-store %store "flat-test" #f "sha256" file))) (and (eq? 'regular (stat:type (stat drv))) (valid-path? %store drv) @@ -104,7 +107,9 @@ (call-with-input-file drv get-bytevector-all))))) (test-assert "add-to-store, recursive" - (let* ((dir (dirname (search-path %load-path "language/tree-il/spec.scm"))) + (let* ((dir (dirname + (readlink* (search-path %load-path + "language/tree-il/spec.scm")))) (drv (add-to-store %store "dir-tree-test" #t "sha256" dir))) (and (eq? 'directory (stat:type (stat drv))) (valid-path? %store drv) |