From 862abf8fcd8bcd9fb18f3f570b41ecaccfda43a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 6 Feb 2015 18:04:19 +0100 Subject: [PATCH] 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'. --- tests/packages.scm | 17 +++++++++-------- 1 file 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 . - (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"))