summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-02-06 18:04:19 +0100
committerLudovic Courtès <ludo@gnu.org>2015-02-06 18:04:19 +0100
commit862abf8fcd8bcd9fb18f3f570b41ecaccfda43a1 (patch)
tree639735a4d3b3c568f10b8b9ce84f4ee7a754f659
parentc9323a4c69d48bc9af3825674e43a3febbb42091 (diff)
downloadguix-862abf8fcd8bcd9fb18f3f570b41ecaccfda43a1.tar.gz
tests: Disable grafts when comparing derivations.
Fixes a regression introduced with the grafting of Patch in 3f11f01.

* tests/packages.scm ("reference to non-existent output"): Wrap in
  'parameterize'.
-rw-r--r--tests/packages.scm17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/packages.scm b/tests/packages.scm
index 65e5cc3cdd..851520b343 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -270,14 +270,15 @@
 
 (test-assert "reference to non-existent output"
   ;; See <http://bugs.gnu.org/19630>.
-  (let* ((dep (dummy-package "dep"))
-         (p   (dummy-package "p"
-                (inputs `(("dep" ,dep "non-existent"))))))
-    (guard (c ((derivation-missing-output-error? c)
-               (and (string=? (derivation-missing-output c) "non-existent")
-                    (equal? (package-derivation %store dep)
-                            (derivation-error-derivation c)))))
-      (package-derivation %store p))))
+  (parameterize ((%graft? #f))
+    (let* ((dep (dummy-package "dep"))
+           (p   (dummy-package "p"
+                  (inputs `(("dep" ,dep "non-existent"))))))
+      (guard (c ((derivation-missing-output-error? c)
+                 (and (string=? (derivation-missing-output c) "non-existent")
+                      (equal? (package-derivation %store dep)
+                              (derivation-error-derivation c)))))
+        (package-derivation %store p)))))
 
 (test-assert "trivial"
   (let* ((p (package (inherit (dummy-package "trivial"))