aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-18 23:25:49 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-19 10:23:28 +0200
commit020f3e41568d4f76544e3e1c10e1d8dd4effc424 (patch)
tree84e5d4c15c063042e24fe96a5b87f22d9206af7a /tests
parentb22755be951f80364673e4ed7f4ad8cea4899f2a (diff)
downloadguix-020f3e41568d4f76544e3e1c10e1d8dd4effc424.tar
guix-020f3e41568d4f76544e3e1c10e1d8dd4effc424.tar.gz
gexp: 'local-file' now defaults to non-recursive.
Reported by Alex Kost <alezost@gmail.com> at <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00235.html>. * guix/gexp.scm (local-file): Change #:recursive? to default to #f. * tests/gexp.scm ("one local file", "gexp->derivation, local-file"): Adjust calls to 'add-to-store' and 'interned-file' accordingly.
Diffstat (limited to 'tests')
-rw-r--r--tests/gexp.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 7e14073fd4..fee7d87d00 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -101,7 +101,7 @@
(let* ((file (search-path %load-path "guix.scm"))
(local (local-file file))
(exp (gexp (display (ungexp local))))
- (intd (add-to-store %store (basename file) #t
+ (intd (add-to-store %store (basename file) #f
"sha256" file)))
(and (gexp? exp)
(match (gexp-inputs exp)
@@ -360,7 +360,7 @@
(test-assertm "gexp->derivation, local-file"
(mlet* %store-monad ((file -> (search-path %load-path "guix.scm"))
- (intd (interned-file file))
+ (intd (interned-file file #:recursive? #f))
(local -> (local-file file))
(exp -> (gexp (begin
(stat (ungexp local))