diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-10-28 01:58:39 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-28 01:58:39 +0200 |
commit | 8f3ecbd7157aa4bf63069d69280351bd04c85eb0 (patch) | |
tree | 938beea4c0673199829a8d27cc84f0cd035ed820 /tests/packages.scm | |
parent | 9144af5aa7b757b1dacd3f39ebdac8a31bc36e9f (diff) | |
download | guix-8f3ecbd7157aa4bf63069d69280351bd04c85eb0.tar guix-8f3ecbd7157aa4bf63069d69280351bd04c85eb0.tar.gz |
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.
Diffstat (limited to 'tests/packages.scm')
-rw-r--r-- | tests/packages.scm | 9 |
1 files changed, 3 insertions, 6 deletions
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 @@ (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)) |