diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-14 21:26:22 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-14 21:57:39 +0200 |
| commit | 03d76577b96ba81c9921eb3a297d42db8644280b (patch) | |
| tree | 8814bcef3f082a98f853ca7bacf02a552a76a1d2 /tests/guix-package-net.sh | |
| parent | 11b4a8716c65e8fe21e5975e764b3e14dbd8dcc4 (diff) | |
| download | patches-03d76577b96ba81c9921eb3a297d42db8644280b.tar patches-03d76577b96ba81c9921eb3a297d42db8644280b.tar.gz | |
tests: Make builds less expensive.
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.
Diffstat (limited to 'tests/guix-package-net.sh')
| -rw-r--r-- | tests/guix-package-net.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh index 82c346dd4c..48a94865e1 100644 --- a/tests/guix-package-net.sh +++ b/tests/guix-package-net.sh @@ -57,7 +57,7 @@ test -L "$profile" && test -L "$profile-1-link" ! test -f "$profile-2-link" test -f "$profile/bin/guile" -boot_make="(@@ (gnu packages commencement) gnu-make-boot0)" +boot_make="(@ (guix tests) gnu-make-for-tests)" boot_make_drv="`guix build -e "$boot_make" | grep -v -e -debug`" guix package --bootstrap -p "$profile" -i "$boot_make_drv" test -L "$profile-2-link" |