guix-commits
[Top][All Lists]
Advanced

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

01/07: gnu: guix-devel: Update snapshot and re-enable container tests.


From: David Thompson
Subject: 01/07: gnu: guix-devel: Update snapshot and re-enable container tests.
Date: Wed, 02 Sep 2015 00:04:39 +0000

davexunit pushed a commit to branch wip-container
in repository guix.

commit 4fae0533d549daf8bc4bdeff38ac294385d511ac
Author: David Thompson <address@hidden>
Date:   Sat Aug 1 21:36:41 2015 -0400

    gnu: guix-devel: Update snapshot and re-enable container tests.
    
    * gnu/packages/package-management.scm (guix-devel): Update snapshot to 
commit
      831bc14.  Delete 'disable-container-tests' phase.
---
 gnu/packages/package-management.scm |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 55e5037..d9653ed 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -176,7 +176,7 @@ the Nix package manager.")
   ;;
   ;; Note: use a short commit id; when using the long one, the limit on socket
   ;; file names is exceeded while running the tests.
-  (let ((commit "5d09263"))
+  (let ((commit "831bc14"))
     (package (inherit guix-0.8.3)
       (version (string-append "0.8.3." commit))
       (source (origin
@@ -186,7 +186,7 @@ the Nix package manager.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0v5g90di91j218x620shib7xjrjd5dkk4h1zrlg98hdmbgxq5s3j"))
+                  "17qlzk09sv5p54xyvvcmfcp1q851r3mb0vb1qx7h7xg5fknnndyd"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (arguments
        (substitute-keyword-arguments (package-arguments guix-0.8.3)
@@ -200,18 +200,7 @@ the Nix package manager.")
                             (chmod po #o666))
                           (find-files "." "\\.po$"))
 
-                (zero? (system* "sh" "bootstrap"))))
-             (add-after
-              'unpack 'disable-container-tests
-              ;; XXX FIXME: These tests fail within the build container.
-              (lambda _
-                (substitute* "tests/syscalls.scm"
-                  (("^\\(test-assert \"(clone|setns|pivot-root)\"" all)
-                   (string-append "(test-skip 1)\n" all)))
-                (substitute* "tests/containers.scm"
-                  (("^\\(test-assert" all)
-                   (string-append "(test-skip 1)\n" all)))
-                #t))))))
+                (zero? (system* "sh" "bootstrap"))))))))
       (native-inputs
        `(("autoconf" ,(autoconf-wrapper))
          ("automake" ,automake)



reply via email to

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