aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-20 22:17:58 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-20 22:54:36 +0100
commite509d1527d231b6460a20762e13b57cba2e43485 (patch)
tree750b7bb4c321d42d17ca2b50679d682373d5251b /tests
parent079fca3be86e38bcbefa67e6f07b7ff440726ceb (diff)
downloadguix-e509d1527d231b6460a20762e13b57cba2e43485.tar
guix-e509d1527d231b6460a20762e13b57cba2e43485.tar.gz
packages: Have `package-derivation' return a <derivation> as a second value.
* guix/packages.scm (cache): Change the `drv' argument to `thunk'. Memoize all the return values of THUNK. (cached-derivation): Remove. (cached): New macro. (package-derivation): Use `cached' instead of `(or (cached-derivation) …)'. * doc/guix.texi (Defining Packages): Update accordingly.
Diffstat (limited to 'tests')
-rw-r--r--tests/packages.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/packages.scm b/tests/packages.scm
index ea0df511d2..990deb79ef 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,6 +27,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bootstrap)
+ #:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-64)
#:use-module (rnrs io ports)
@@ -70,7 +71,13 @@
("d" ,d) ("d/x" "something.drv"))
(pk 'x (package-transitive-inputs e))))))
-(test-skip (if (not %store) 2 0))
+(test-skip (if (not %store) 3 0))
+
+(test-assert "return values"
+ (let-values (((drv-path drv)
+ (package-derivation %store (dummy-package "p"))))
+ (and (derivation-path? drv-path)
+ (derivation? drv))))
(test-assert "trivial"
(let* ((p (package (inherit (dummy-package "trivial"))