From 4b1786aa2c2e21e5b0c439cf6ad91f157376af5e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 1 Jul 2012 15:37:58 +0200 Subject: Fix `derivation-hash' for outputs not sorted alphabetically. * guix/derivations.scm (derivation-hash): Reorder OUTPUTS. * tests/derivations.scm ("multiple-output derivation, non-alphabetic order"): New test. --- tests/derivations.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests') diff --git a/tests/derivations.scm b/tests/derivations.scm index b6bd4dab0d..cdb1942539 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -145,6 +145,24 @@ (and (eq? 'one (call-with-input-file one read)) (eq? 'two (call-with-input-file two read))))))) +(test-assert "multiple-output derivation, non-alphabetic order" + ;; Here, the outputs are not listed in alphabetic order. Yet, the store + ;; path computation must reorder them first. + (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" + "echo one > $out ; echo two > $AAA" + '())) + (drv-path (derivation %store "fixed" (%current-system) + "/bin/sh" `(,builder) + '() + `((,builder)) + #:outputs '("out" "AAA"))) + (succeeded? (build-derivations %store (list drv-path)))) + (and succeeded? + (let ((one (derivation-path->output-path drv-path "out")) + (two (derivation-path->output-path drv-path "AAA"))) + (and (eq? 'one (call-with-input-file one read)) + (eq? 'two (call-with-input-file two read))))))) + (define %coreutils (false-if-exception (nixpkgs-derivation "coreutils"))) -- cgit v1.2.3