From 8f3ecbd7157aa4bf63069d69280351bd04c85eb0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Oct 2012 01:58:39 +0200 Subject: tests: Use our own bootstrap tools. * tests/builders.scm (%bootstrap-inputs): Use %BOOT0-INPUTS from the distro. * tests/packages.scm (%bootstrap-inputs): Likewise. * tests/derivations.scm (%coreutils): Alias for %BOOTSTRAP-COREUTILS&CO. --- tests/packages.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/packages.scm') diff --git a/tests/packages.scm b/tests/packages.scm index ff23a7bf41..005e605e83 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -36,12 +36,9 @@ (define %store (false-if-exception (open-connection))) (define %bootstrap-inputs - ;; Derivations taken from Nixpkgs, so that the initial tests don't - ;; take forever. - (and (file-exists? (%nixpkgs-directory)) - `(("make" ,(nixpkgs-derivation "gnumake")) - ("diffutils" ,(nixpkgs-derivation "diffutils")) - ,@(@@ (distro packages base) %bootstrap-inputs)))) + ;; Use the bootstrap inputs so it doesn't take ages to run these tests. + ;; This still involves building GNU Make and GNU Diffutils. + (@@ (distro packages base) %boot0-inputs)) (define %bootstrap-guile (@@ (distro packages base) %bootstrap-guile)) -- cgit v1.2.3