From 80963744a242257921917df5a901dc343d3a93db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 14 May 2020 16:53:42 +0200 Subject: store: 'mapm/accumulate-builds' preserves '%current-target-system'. Fixes . * guix/store.scm (mapm/accumulate-builds): Pass #:system and #:target to 'run-with-store'. * tests/store.scm ("mapm/accumulate-builds, %current-target-system"): New test. * tests/guix-pack.sh: Add 'guix pack -d --target' test. --- tests/store.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests/store.scm') diff --git a/tests/store.scm b/tests/store.scm index 0e80ccc239..0af099c1ad 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -475,6 +475,23 @@ (run-with-store %store (mapm/accumulate-builds built-derivations `((,d1) (,d2))))))) +(test-equal "mapm/accumulate-builds, %current-target-system" + (make-list 2 '("i586-pc-gnu" "i586-pc-gnu")) + ;; Both the 'mapm' and 'mapm/accumulate-builds' procedures should see the + ;; right #:target. + (run-with-store %store + (mlet %store-monad ((lst1 (mapm %store-monad + (lambda _ + (current-target-system)) + '(a b))) + (lst2 (mapm/accumulate-builds + (lambda _ + (current-target-system)) + '(a b)))) + (return (list lst1 lst2))) + #:system system + #:target "i586-pc-gnu")) + (test-assert "topologically-sorted, one item" (let* ((a (add-text-to-store %store "a" "a")) (b (add-text-to-store %store "b" "b" (list a))) -- cgit v1.2.3