guix-commits
[Top][All Lists]
Advanced

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

03/07: tests: Remove expensive and pointless test.


From: guix-commits
Subject: 03/07: tests: Remove expensive and pointless test.
Date: Fri, 14 Jun 2019 17:35:35 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 11b4a8716c65e8fe21e5975e764b3e14dbd8dcc4
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 14 17:38:51 2019 +0200

    tests: Remove expensive and pointless test.
    
    This test had become too expensive since the introduction of the reduced
    bootstrap.
    
    * tests/builders.scm ("gnu-build"): Remove.
    (%bootstrap-inputs, %bootstrap-search-paths): Remove.
---
 tests/builders.scm | 41 +----------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/tests/builders.scm b/tests/builders.scm
index b2d8a7c..fdcf38d 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2019 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,27 +40,6 @@
 (define %store
   (open-connection-for-tests))
 
-(define (%bootstrap-inputs)
-  ;; Use the bootstrap inputs so it doesn't take ages to run these tests.
-  ;; This still involves building Make, Diffutils, and Findutils.
-  ;; XXX: We're relying on the higher-level `package-derivations' here.
-  (and %store
-       (map (match-lambda
-             ((name package)
-              (list name (package-derivation %store package))))
-            (filter
-             (compose package? cadr)
-             ((@@ (gnu packages commencement) %boot0-inputs))))))
-
-(define (%bootstrap-search-paths)
-  ;; Search path specifications that go with %BOOTSTRAP-INPUTS.
-  (append-map (match-lambda
-                ((name package _ ...)
-                 (package-native-search-paths package)))
-              (filter
-               (compose package? cadr)
-               ((@@ (gnu packages commencement) %boot0-inputs)))))
-
 (define url-fetch*
   (store-lower url-fetch))
 
@@ -99,22 +78,4 @@
 (test-assert "gnu-build-system"
   (build-system? gnu-build-system))
 
-(when (or (not (network-reachable?)) (shebang-too-long?))
-  (test-skip 1))
-(test-assert "gnu-build"
-  (let* ((url      "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz";)
-         (hash     (nix-base32-string->bytevector
-                    "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"))
-         (tarball  (url-fetch* %store url 'sha256 hash
-                               #:guile %bootstrap-guile))
-         (build    (gnu-build %store "hello-2.8"
-                              `(("source" ,tarball)
-                                ,@(%bootstrap-inputs))
-                              #:guile %bootstrap-guile
-                              #:search-paths (%bootstrap-search-paths)))
-         (out      (derivation->output-path build)))
-    (and (build-derivations %store (list (pk 'hello-drv build)))
-         (valid-path? %store out)
-         (file-exists? (string-append out "/bin/hello")))))
-
 (test-end "builders")



reply via email to

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