amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Make builds less expensive.

Browse source 
The switch to the reduced bootstrap broke build time assumptions made by
tests, notably the assumption that GNU-MAKE-BOOT0 was cheap to build.
This commit adjusts this to make these tests cheaper.

* gnu/packages/bootstrap.scm (%bootstrap-inputs-for-tests): New variable.
* guix/tests.scm (gnu-make-for-tests): New variable.
* tests/guix-environment.sh: Use GNU-MAKE-FOR-TESTS instead of
GNU-MAKE-BOOT0.  Remove test with FINDUTILS-BOOT0.
* tests/guix-package-net.sh (boot_make): Use GNU-MAKE-FOR-TESTS.
* tests/packages.scm ("GNU Make, bootstrap"): Likewise.
* tests/profiles.scm ("profile-derivation relative symlinks, two entries"):
Likewise.
* tests/union.scm (%bootstrap-inputs): Remove.
("union-build"): Use %BOOTSTRAP-INPUTS-FOR-TESTS instead of
%BOOTSTRAP-INPUTS.
This commit is contained in:
Ludovic Courtès 2019-06-14 21:26:22 +02:00
parent 11b4a8716c
commit 03d76577b9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
7 changed files with 61 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/bootstrap.scm
View file

@ -53,7 +53,9 @@
%bootstrap-glibc
%bootstrap-inputs
%bootstrap-mescc-tools
%bootstrap-mes))
%bootstrap-mes
%bootstrap-inputs-for-tests))
;;; Commentary:
;;;
@ -809,4 +811,14 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
;; In gnu-build-system.scm, we rely on the availability of Bash.
("bash" ,%bootstrap-coreutils&co)))
(define %bootstrap-inputs-for-tests
;; These are bootstrap inputs that are cheap to produce (no compilation
;; needed) and that are meant to be used for testing. (These are those we
;; used before the Mes-based reduced bootstrap.)
`(("libc" ,%bootstrap-glibc)
("gcc" ,%bootstrap-gcc)
("binutils" ,%bootstrap-binutils)
("coreutils&co" ,%bootstrap-coreutils&co)
("bash" ,%bootstrap-coreutils&co)))
;;; bootstrap.scm ends here