diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-11-09 23:59:11 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-09 23:59:11 +0100 |
commit | 9e782349fe38651f6a87cc2a03f760bcbd8250bd (patch) | |
tree | 25490a3890c19a5c41e8e2aea6a9d5423764dd6d /tests | |
parent | cfeb75954a0fcf51acc2d33599e01e153a3570db (diff) | |
download | guix-9e782349fe38651f6a87cc2a03f760bcbd8250bd.tar guix-9e782349fe38651f6a87cc2a03f760bcbd8250bd.tar.gz |
tests: Choose a less expensive test for packages.
* tests/packages.scm (%bootstrap-inputs): Remove.
("GNU Hello"): Rename to...
("GNU Make, bootstrap"): ... this. Build GNU-MAKE-BOOT0 instead of
HELLO.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/packages.scm | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index 5838257e09..29ea691e9f 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -40,11 +40,6 @@ ;; Make sure we build everything by ourselves. (set-build-options %store #:use-substitutes? #f)) -(define %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)) - (test-begin "packages") @@ -113,16 +108,17 @@ (let ((p (pk 'drv d (derivation-path->output-path d)))) (eq? 'hello (call-with-input-file p read)))))) -(test-assert "GNU Hello" - (let ((hello (package-with-explicit-inputs hello %bootstrap-inputs - #:guile %bootstrap-guile))) - (and (package? hello) - (or (location? (package-location hello)) - (not (package-location hello))) - (let* ((drv (package-derivation %store hello)) +(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 (@@ (distro packages base) gnu-make-boot0))) + (and (package? gnu-make) + (or (location? (package-location gnu-make)) + (not (package-location gnu-make))) + (let* ((drv (package-derivation %store gnu-make)) (out (derivation-path->output-path drv))) (and (build-derivations %store (list drv)) - (file-exists? (string-append out "/bin/hello"))))))) + (file-exists? (string-append out "/bin/make"))))))) (test-assert "find-packages-by-name" (match (find-packages-by-name "hello") |