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 | |
| parent | cfeb75954a0fcf51acc2d33599e01e153a3570db (diff) | |
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.
| -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 5838257e092..29ea691e9ff 100644 --- a/tests/packages.scm +++ b/tests/packages.scm | |||
| @@ -40,11 +40,6 @@ | |||
| 40 | ;; Make sure we build everything by ourselves. | 40 | ;; Make sure we build everything by ourselves. |
| 41 | (set-build-options %store #:use-substitutes? #f)) | 41 | (set-build-options %store #:use-substitutes? #f)) |
| 42 | 42 | ||
| 43 | (define %bootstrap-inputs | ||
| 44 | ;; Use the bootstrap inputs so it doesn't take ages to run these tests. | ||
| 45 | ;; This still involves building GNU Make and GNU Diffutils. | ||
| 46 | (@@ (distro packages base) %boot0-inputs)) | ||
| 47 | |||
| 48 | 43 | ||
| 49 | (test-begin "packages") | 44 | (test-begin "packages") |
| 50 | 45 | ||
| @@ -113,16 +108,17 @@ | |||
| 113 | (let ((p (pk 'drv d (derivation-path->output-path d)))) | 108 | (let ((p (pk 'drv d (derivation-path->output-path d)))) |
| 114 | (eq? 'hello (call-with-input-file p read)))))) | 109 | (eq? 'hello (call-with-input-file p read)))))) |
| 115 | 110 | ||
| 116 | (test-assert "GNU Hello" | 111 | (test-assert "GNU Make, bootstrap" |
| 117 | (let ((hello (package-with-explicit-inputs hello %bootstrap-inputs | 112 | ;; GNU Make is the first program built during bootstrap; we choose it |
| 118 | #:guile %bootstrap-guile))) | 113 | ;; here so that the test doesn't last for too long. |
| 119 | (and (package? hello) | 114 | (let ((gnu-make (@@ (distro packages base) gnu-make-boot0))) |
| 120 | (or (location? (package-location hello)) | 115 | (and (package? gnu-make) |
| 121 | (not (package-location hello))) | 116 | (or (location? (package-location gnu-make)) |
| 122 | (let* ((drv (package-derivation %store hello)) | 117 | (not (package-location gnu-make))) |
| 118 | (let* ((drv (package-derivation %store gnu-make)) | ||
| 123 | (out (derivation-path->output-path drv))) | 119 | (out (derivation-path->output-path drv))) |
| 124 | (and (build-derivations %store (list drv)) | 120 | (and (build-derivations %store (list drv)) |
| 125 | (file-exists? (string-append out "/bin/hello"))))))) | 121 | (file-exists? (string-append out "/bin/make"))))))) |
| 126 | 122 | ||
| 127 | (test-assert "find-packages-by-name" | 123 | (test-assert "find-packages-by-name" |
| 128 | (match (find-packages-by-name "hello") | 124 | (match (find-packages-by-name "hello") |
