From 7e75a6739bf02c39baf8340e31e590c2c7c5fd16 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 Mar 2015 16:26:13 +0100 Subject: gexp: Make sure 'gexp-outputs' removes duplicate outputs. Fixes a regression introduced in f9efe56. * guix/gexp.scm (gexp-outputs): Add call to 'delete-duplicates'. * tests/gexp.scm ("output list, combined gexps, duplicate output"): New test. --- tests/gexp.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests') diff --git a/tests/gexp.scm b/tests/gexp.scm index 2ec6c8e3ef..783ca2cdbc 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -230,6 +230,13 @@ (gexp-outputs exp2)) (= 2 (length (gexp-outputs exp2)))))) +(test-equal "output list, combined gexps, duplicate output" + 1 + (let* ((exp0 (gexp (mkdir (ungexp output)))) + (exp1 (gexp (begin (mkdir (ungexp output)) (ungexp exp0)))) + (exp2 (gexp (begin (mkdir (ungexp output)) (ungexp exp1))))) + (length (gexp-outputs exp2)))) + (test-assert "output list + ungexp-splicing list, combined gexps" (let* ((exp0 (gexp (mkdir (ungexp output)))) (exp1 (gexp (mkdir (ungexp output "foo")))) -- cgit v1.2.3