diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-07-11 22:37:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-07-12 01:27:00 +0200 |
| commit | 686784d0b958478a0fd8a2fbf69755ceea2d27ec (patch) | |
| tree | 51c14f8b2b9301fcfaa87676ccdcb59d6c8008db /tests | |
| parent | aa7251176f273d64ec54f71e305d813092bf4c7f (diff) | |
| download | patches-686784d0b958478a0fd8a2fbf69755ceea2d27ec.tar patches-686784d0b958478a0fd8a2fbf69755ceea2d27ec.tar.gz | |
tests: Adjust tests for new bootstrap Guile.
This is a followup to commit 5d6792f ("gnu: bootstrap: Create a wrapper for
guile to set the system load path.")
* tests/size.scm ("store-profile"): Expect profile of 'bash' bootstrap binary.
* tests/gexp.scm ("gexp->derivation #:references-graphs"): Expect GUILE-DRV to
depend on 'bash' bootstrap binary.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gexp.scm | 7 | ||||
| -rw-r--r-- | tests/size.scm | 19 |
2 files changed, 20 insertions, 6 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index 5c9a4fc031..740d74620e 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -536,6 +536,9 @@ (guix build utils)))) (ok? (built-derivations (list drv))) (guile-drv (package->derivation %bootstrap-guile)) + (bash (interned-file (search-bootstrap-binary "bash" + (%current-system)) + "bash" #:recursive? #t)) (g-one -> (derivation->output-path drv "one")) (g-two -> (derivation->output-path drv "two")) (g-guile -> (derivation->output-path drv))) @@ -543,8 +546,10 @@ (equal? (call-with-input-file g-one read) (list one)) (equal? (call-with-input-file g-two read) (list one (derivation->output-path two "chbouib"))) + + ;; Note: %BOOTSTRAP-GUILE depends on the bootstrap Bash. (equal? (call-with-input-file g-guile read) - (list (derivation->output-path guile-drv))))))) + (list (derivation->output-path guile-drv) bash)))))) (test-assertm "gexp->derivation #:allowed-references" (mlet %store-monad ((drv (gexp->derivation "allowed-refs" diff --git a/tests/size.scm b/tests/size.scm index 95b99a88ef..a1106045f8 100644 --- a/tests/size.scm +++ b/tests/size.scm @@ -24,6 +24,7 @@ #:use-module (guix gexp) #:use-module (guix tests) #:use-module (guix scripts size) + #:use-module (gnu packages) #:use-module (gnu packages bootstrap) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -54,9 +55,15 @@ (built-derivations (list file2)) (mlet %store-monad ((profiles (store-profile (derivation->output-path file2))) + (bash (interned-file + (search-bootstrap-binary + "bash" (%current-system)) "bash" + #:recursive? #t)) (guile (package->derivation %bootstrap-guile))) - (define (lookup-profile drv) - (find (matching-profile (derivation->output-path drv)) + (define (lookup-profile item) + (find (matching-profile (if (derivation? item) + (derivation->output-path item) + item)) profiles)) (letrec-syntax ((match* (syntax-rules (=>) @@ -67,15 +74,17 @@ ((_ () body) body)))) ;; Make sure we get all three profiles with sensible values. - (return (and (= (length profiles) 3) + (return (and (= (length profiles) 4) (match* ((file1 => profile1) (file2 => profile2) - (guile => profile3)) + (guile => profile3) + (bash => profile4)) ;dependency of GUILE (and (> (profile-closure-size profile2) 0) (= (profile-closure-size profile2) (+ (profile-self-size profile1) (profile-self-size profile2) - (profile-self-size profile3)))))))))))) + (profile-self-size profile3) + (profile-self-size profile4)))))))))))) (test-end "size") |