guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/04: tests: Disable grafts when comparing derivations.


From: Ludovic Courtès
Subject: 04/04: tests: Disable grafts when comparing derivations.
Date: Fri, 06 Feb 2015 17:04:52 +0000

civodul pushed a commit to branch master
in repository guix.

commit 862abf8fcd8bcd9fb18f3f570b41ecaccfda43a1
Author: Ludovic Courtès <address@hidden>
Date:   Fri Feb 6 18:04:19 2015 +0100

    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 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/packages.scm b/tests/packages.scm
index 65e5cc3..851520b 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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]