aboutsummaryrefslogtreecommitdiff
path: root/tests/gexp.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-15 21:59:19 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-17 22:25:54 +0100
commita482cfdcaee493a0ce796b4cd2059c46fce6d14d (patch)
treee9e31d9e21b3e20f02bb32fafcf6fc06558be834 /tests/gexp.scm
parentb4a4bec01a8b990dc4108060a645512f9b428aac (diff)
downloadguix-a482cfdcaee493a0ce796b4cd2059c46fce6d14d.tar
guix-a482cfdcaee493a0ce796b4cd2059c46fce6d14d.tar.gz
gexp: Remove special meaning of forms (PACKAGE OUTPUT) in ungexp.
* guix/gexp.scm (gexp-inputs)[add-reference-inputs]: Remove clause for inputs of the form (PACKAGE OUTPUT). (gexp->sexp)[reference->sexp]: Likewise. * tests/gexp.scm ("input list splicing"): Change 'list' to 'gexp-input' for glibc:debug. ("text-file*"): Likewise for %bootstrap-guile:out. ("input list splicing + gexp-input + ungexp-native-splicing"): Remove, now redundant.
Diffstat (limited to 'tests/gexp.scm')
-rw-r--r--tests/gexp.scm14
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 1e27407926..4c31e22f15 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -196,7 +196,7 @@
(gexp->sexp* exp target)))))
(test-assert "input list splicing"
- (let* ((inputs (list (list glibc "debug") %bootstrap-guile))
+ (let* ((inputs (list (gexp-input glibc "debug") %bootstrap-guile))
(outputs (list (derivation->output-path
(package-derivation %store glibc)
"debug")
@@ -210,16 +210,6 @@
`(list ,@(cons 5 outputs))))))
(test-assert "input list splicing + ungexp-native-splicing"
- (let* ((inputs (list (list glibc "debug") %bootstrap-guile))
- (exp (gexp (list (ungexp-native-splicing (cons (+ 2 3) inputs))))))
- (and (lset= equal?
- `((,glibc "debug") (,%bootstrap-guile "out"))
- (gexp-native-inputs exp))
- (null? (gexp-inputs exp))
- (equal? (gexp->sexp* exp) ;native
- (gexp->sexp* exp "mips64el-linux")))))
-
-(test-assert "input list splicing + gexp-input + ungexp-native-splicing"
(let* ((inputs (list (gexp-input glibc "debug") %bootstrap-guile))
(exp (gexp (list (ungexp-native-splicing (cons (+ 2 3) inputs))))))
(and (lset= equal?
@@ -553,7 +543,7 @@
(file (text-file "bar" "This is bar."))
(text (text-file* "foo"
%bootstrap-guile "/bin/guile "
- `(,%bootstrap-guile "out") "/bin/guile "
+ (gexp-input %bootstrap-guile "out") "/bin/guile "
drv "/bin/guile "
file))
(done (built-derivations (list text)))