ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: gexp: Handle incorrect guile-bootstrap version for riscv.

Browse source 
The tests currently fail when run on riscv-linux (affecting the guix package)
because Guile 3 is used as the bootstrap guile.  Correcting the package
version seems hard, so I'm just tweaking the tests to use the right effective
version for riscv64-linux.

* tests/gexp.scm (bootstrap-guile-effective-version): New procedure.
("gexp->derivation & with-extensions", "lower-gexp", "lower-gexp,
raw-derivation-file"): Use bootstrap-guile-effective-version.

Change-Id: I3995e1f6b58ada1baf38a8ec55b0173059dd0079
This commit is contained in:
Christopher Baines 2024-07-30 11:09:20 +01:00
parent 450cd7e15f
commit f4aec15f47
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/gexp.scm
View file

@ -47,6 +47,13 @@ (define-module (test-gexp)
(define %store (define %store
(open-connection-for-tests)) (open-connection-for-tests))
(define (bootstrap-guile-effective-version)
;; TODO The package version of %bootstrap-guile is incorrect for
;; riscv64-linux
(if (string=? "riscv64-linux" (%current-system))
"3.0"
(package-version %bootstrap-guile)))
;; Globally disable grafts because they can trigger early builds. ;; Globally disable grafts because they can trigger early builds.
(%graft? #f) (%graft? #f)
@ -1099,8 +1106,8 @@ (define (multiply x)
(write (list the-answer (multiply 2)) (write (list the-answer (multiply 2))
port))))))) port)))))))
(drv (gexp->derivation "thingie" build (drv (gexp->derivation "thingie" build
;; %BOOTSTRAP-GUILE is 2.0. #:effective-version
#:effective-version "2.0")) (bootstrap-guile-effective-version)))
(out -> (derivation->output-path drv))) (out -> (derivation->output-path drv)))
(mbegin %store-monad (mbegin %store-monad
(built-derivations (list drv)) (built-derivations (list drv))
@ -1120,7 +1127,8 @@ (define (multiply x)
mkdir-p mkdir-p
the-answer)))) the-answer))))
(lexp (lower-gexp exp (lexp (lower-gexp exp
#:effective-version "2.0"))) #:effective-version
(bootstrap-guile-effective-version))))
(define (matching-input drv output) (define (matching-input drv output)
(lambda (input) (lambda (input)
(and (eq? (derivation-input-derivation input) drv) (and (eq? (derivation-input-derivation input) drv)
@ -1134,12 +1142,15 @@ (define (matching-input drv output)
(lowered-gexp-inputs lexp)) (lowered-gexp-inputs lexp))
(member (string-append (member (string-append
(derivation->output-path extension-drv) (derivation->output-path extension-drv)
"/share/guile/site/2.0") "/share/guile/site/"
(bootstrap-guile-effective-version))
(lowered-gexp-load-path lexp)) (lowered-gexp-load-path lexp))
(= 2 (length (lowered-gexp-load-path lexp))) (= 2 (length (lowered-gexp-load-path lexp)))
(member (string-append (member (string-append
(derivation->output-path extension-drv) (derivation->output-path extension-drv)
"/lib/guile/2.0/site-ccache") "/lib/guile/"
(bootstrap-guile-effective-version)
"/site-ccache")
(lowered-gexp-load-compiled-path lexp)) (lowered-gexp-load-compiled-path lexp))
(= 2 (length (lowered-gexp-load-compiled-path lexp))) (= 2 (length (lowered-gexp-load-compiled-path lexp)))
(eq? (derivation-input-derivation (lowered-gexp-guile lexp)) (eq? (derivation-input-derivation (lowered-gexp-guile lexp))
@ -1149,7 +1160,10 @@ (define (matching-input drv output)
(mlet* %store-monad ((thing -> (program-file "prog" #~(display "hi!"))) (mlet* %store-monad ((thing -> (program-file "prog" #~(display "hi!")))
(exp -> #~(list #$(raw-derivation-file thing))) (exp -> #~(list #$(raw-derivation-file thing)))
(drv (lower-object thing)) (drv (lower-object thing))
(lexp (lower-gexp exp #:effective-version "2.0"))) (lexp (lower-gexp
exp
#:effective-version
(bootstrap-guile-effective-version))))
(return (and (equal? `(list ,(derivation-file-name drv)) (return (and (equal? `(list ,(derivation-file-name drv))
(lowered-gexp-sexp lexp)) (lowered-gexp-sexp lexp))
(equal? (list (derivation-file-name drv)) (equal? (list (derivation-file-name drv))