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/packages.scm | |
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/packages.scm')
-rw-r--r-- | tests/packages.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index af1f76e36d..bd100bea5b 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -935,9 +935,9 @@ (when (or (not (network-reachable?)) (shebang-too-long?)) (test-skip 1)) (test-assert "GNU Make, bootstrap" - ;; GNU Make is the first program built during bootstrap; we choose it - ;; here so that the test doesn't last for too long. - (let ((gnu-make (@@ (gnu packages commencement) gnu-make-boot0))) + ;; GNU-MAKE-FOR-TESTS can be built cheaply; we choose it here so that the + ;; test doesn't last for too long. + (let ((gnu-make gnu-make-for-tests)) (and (package? gnu-make) (or (location? (package-location gnu-make)) (not (package-location gnu-make))) |