diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cpio.scm | 6 | ||||
| -rw-r--r-- | tests/egg.scm | 5 | ||||
| -rw-r--r-- | tests/gexp.scm | 31 | ||||
| -rw-r--r-- | tests/opam.scm | 5 | ||||
| -rw-r--r-- | tests/pack.scm | 2 | ||||
| -rw-r--r-- | tests/publish.scm | 5 | ||||
| -rw-r--r-- | tests/store-database.scm | 59 | ||||
| -rw-r--r-- | tests/utils.scm | 3 |
8 files changed, 65 insertions, 51 deletions
diff --git a/tests/cpio.scm b/tests/cpio.scm index 832101d1bb..35a704822b 100644 --- a/tests/cpio.scm +++ b/tests/cpio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,8 +19,8 @@ (define-module (test-cpio) #:use-module (guix cpio) #:use-module (guix tests) - #:use-module ((guix build utils) #:select (which)) - #:use-module ((guix utils) #:select (call-with-temporary-output-file)) + #:use-module ((guix build utils) + #:select (which call-with-temporary-output-file)) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (rnrs io ports) diff --git a/tests/egg.scm b/tests/egg.scm index a7d3378dd7..c74f954683 100644 --- a/tests/egg.scm +++ b/tests/egg.scm @@ -24,8 +24,9 @@ #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module ((guix build syscalls) #:select (mkdtemp!)) - #:use-module ((guix build utils) #:select (delete-file-recursively mkdir-p which)) - #:use-module ((guix utils) #:select (call-with-temporary-output-file)) + #:use-module ((guix build utils) + #:select (delete-file-recursively mkdir-p which + call-with-temporary-output-file)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) #:use-module (web uri) diff --git a/tests/gexp.scm b/tests/gexp.scm index 001786c13c..905009caee 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021-2022 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. @@ -661,7 +661,8 @@ (mlet* %store-monad ((exp -> (gexp (display (ungexp %bootstrap-guile)))) (guile (package-file %bootstrap-guile)) (sexp (gexp->sexp exp (%current-system) #f)) - (drv (gexp->file "foo" exp)) + (drv (gexp->file "foo" exp + #:guile %bootstrap-guile)) (out -> (derivation->output-path drv)) (done (built-derivations (list drv))) (refs (references* out))) @@ -672,7 +673,8 @@ (mlet* %store-monad ((exp -> #~#$(file-append %bootstrap-guile "/bin/guile")) (guile (package-file %bootstrap-guile)) - (drv (gexp->file "foo" exp)) + (drv (gexp->file "foo" exp + #:guile %bootstrap-guile)) (out -> (derivation->output-path drv)) (done (built-derivations (list drv))) (refs (references* out))) @@ -685,7 +687,9 @@ #~(define foo 'bar) #~(define guile #$%bootstrap-guile))) (guile (package-file %bootstrap-guile)) - (drv (gexp->file "splice" exp #:splice? #t)) + (drv (gexp->file "splice" exp + #:splice? #t + #:guile %bootstrap-guile)) (out -> (derivation->output-path drv)) (done (built-derivations (list drv))) (refs (references* out))) @@ -943,7 +947,8 @@ (let ((make-file (lambda () ;; Use 'eval' to make sure we get an object that's not ;; 'eq?' nor 'equal?' due to the closures it embeds. - (eval '(scheme-file "bar.scm" #~(define-module (bar))) + (eval '(scheme-file "bar.scm" #~(define-module (bar)) + #:guile %bootstrap-guile) (current-module))))) (define result ((@@ (guix gexp) gexp-modules) @@ -1035,7 +1040,8 @@ importing.* \\(guix config\\) from the host" #:export (the-answer)) (define the-answer 42)) - #:splice? #t)) + #:splice? #t + #:guile %bootstrap-guile)) (build -> (with-imported-modules `(((foo bar) => ,module) (guix build utils)) #~(begin @@ -1080,7 +1086,8 @@ importing.* \\(guix config\\) from the host" (define (multiply x) (* the-answer x))) - #:splice? #t)) + #:splice? #t + #:guile %bootstrap-guile)) (build -> (with-extensions (list extension) (with-imported-modules `((guix build utils) ((foo) => ,module)) @@ -1432,7 +1439,8 @@ importing.* \\(guix config\\) from the host" (test-assertm "scheme-file" (let* ((text (plain-file "foo" "Hello, world!")) - (scheme (scheme-file "bar" #~(list "foo" #$text)))) + (scheme (scheme-file "bar" #~(list "foo" #$text) + #:guile %bootstrap-guile))) (mlet* %store-monad ((drv (lower-object scheme)) (text (lower-object text)) (out -> (derivation->output-path drv))) @@ -1719,7 +1727,9 @@ importing.* \\(guix config\\) from the host" (test-assertm "gexp->file, cross-compilation" (mlet* %store-monad ((target -> "aarch64-linux-gnu") (exp -> (gexp (list (ungexp coreutils)))) - (xdrv (gexp->file "foo" exp #:target target)) + (xdrv (gexp->file "foo" exp + #:target target + #:guile %bootstrap-guile)) (refs (references* (derivation-file-name xdrv))) (xcu (package->cross-derivation coreutils @@ -1732,7 +1742,8 @@ importing.* \\(guix config\\) from the host" (mlet* %store-monad ((target -> "aarch64-linux-gnu") (_ (set-current-target target)) (exp -> (gexp (list (ungexp coreutils)))) - (xdrv (gexp->file "foo" exp)) + (xdrv (gexp->file "foo" exp + #:guile %bootstrap-guile)) (refs (references* (derivation-file-name xdrv))) (xcu (package->cross-derivation coreutils diff --git a/tests/opam.scm b/tests/opam.scm index 832fea1d9b..f444ef302e 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -24,8 +24,9 @@ #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module ((guix build syscalls) #:select (mkdtemp!)) - #:use-module ((guix build utils) #:select (delete-file-recursively mkdir-p which)) - #:use-module ((guix utils) #:select (call-with-temporary-output-file)) + #:use-module ((guix build utils) + #:select (delete-file-recursively mkdir-p which + call-with-temporary-output-file)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) #:use-module (web uri) diff --git a/tests/pack.scm b/tests/pack.scm index 55445ea1e9..40897a5589 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -209,7 +209,7 @@ (and (every valid-file? '("α" "λ") '("alpha" "lambda")) - (integer? (path-id db #$tree))))))))))) + (integer? (valid-path-id db #$tree))))))))))) (built-derivations (list check)))) (unless store (test-skip 1)) diff --git a/tests/publish.scm b/tests/publish.scm index efb5698bed..d5ec3c954f 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2020 by Amar M. Singh <nly@disroot.org> -;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +25,8 @@ #:use-module (guix scripts publish) #:use-module (guix tests) #:use-module (guix config) - #:use-module (guix utils) + #:use-module ((guix utils) #:select (call-with-temporary-directory)) + #:use-module ((guix build utils) #:select (call-with-temporary-output-file)) #:use-module (gcrypt hash) #:use-module (guix store) #:use-module (guix derivations) diff --git a/tests/store-database.scm b/tests/store-database.scm index d8f3ce8070..177c776b6c 100644 --- a/tests/store-database.scm +++ b/tests/store-database.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017-2018, 2020-2021, 2024 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,9 +21,9 @@ #:use-module (guix store) #:use-module (guix store database) #:use-module (guix build store-copy) - #:use-module ((guix utils) #:select (call-with-temporary-output-file)) #:use-module ((guix build utils) - #:select (mkdir-p delete-file-recursively)) + #:select (mkdir-p delete-file-recursively + call-with-temporary-output-file)) #:use-module (srfi srfi-26) #:use-module (srfi srfi-64)) @@ -87,23 +87,22 @@ (lambda (db-file port) (delete-file db-file) (with-database db-file db - (sqlite-register db - #:path "/gnu/foo" - #:references '() - #:deriver "/gnu/foo.drv" - #:hash (string-append "sha256:" (make-string 64 #\e)) - #:nar-size 1234) - (sqlite-register db - #:path "/gnu/bar" - #:references '("/gnu/foo") - #:deriver "/gnu/bar.drv" - #:hash (string-append "sha256:" (make-string 64 #\a)) - #:nar-size 4321) - (let ((path-id (@@ (guix store database) path-id))) - (list (path-id db "/gnu/foo") - (path-id db "/gnu/bar"))))))) + (register-valid-path db + #:path "/gnu/foo" + #:references '() + #:deriver "/gnu/foo.drv" + #:hash (string-append "sha256:" (make-string 64 #\e)) + #:nar-size 1234) + (register-valid-path db + #:path "/gnu/bar" + #:references '("/gnu/foo") + #:deriver "/gnu/bar.drv" + #:hash (string-append "sha256:" (make-string 64 #\a)) + #:nar-size 4321) + (list (valid-path-id db "/gnu/foo") + (valid-path-id db "/gnu/bar")))))) -(test-assert "sqlite-register with unregistered references" +(test-assert "register-valid-path with unregistered references" ;; Make sure we get a "NOT NULL constraint failed: Refs.reference" error ;; when we try to add references that are not registered yet. Better safe ;; than sorry. @@ -113,17 +112,17 @@ (catch 'sqlite-error (lambda () (with-database db-file db - (sqlite-register db #:path "/gnu/foo" - #:references '("/gnu/bar") - #:deriver "/gnu/foo.drv" - #:hash (string-append "sha256:" (make-string 64 #\e)) - #:nar-size 1234)) + (register-valid-path db #:path "/gnu/foo" + #:references '("/gnu/bar") + #:deriver "/gnu/foo.drv" + #:hash (string-append "sha256:" (make-string 64 #\e)) + #:nar-size 1234)) #f) (lambda args (pk 'welcome-exception! args) #t))))) -(test-equal "sqlite-register with incorrect size" +(test-equal "register-valid-path with incorrect size" 'out-of-range (call-with-temporary-output-file (lambda (db-file port) @@ -131,11 +130,11 @@ (catch #t (lambda () (with-database db-file db - (sqlite-register db #:path "/gnu/foo" - #:references '("/gnu/bar") - #:deriver "/gnu/foo.drv" - #:hash (string-append "sha256:" (make-string 64 #\e)) - #:nar-size -1234)) + (register-valid-path db #:path "/gnu/foo" + #:references '("/gnu/bar") + #:deriver "/gnu/foo.drv" + #:hash (string-append "sha256:" (make-string 64 #\e)) + #:nar-size -1234)) #f) (lambda (key . _) key))))) diff --git a/tests/utils.scm b/tests/utils.scm index 52f3b58ede..462e43e2b1 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2021, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> @@ -25,6 +25,7 @@ (define-module (test-utils) #:use-module ((guix config) #:select (%gzip)) #:use-module (guix utils) + #:use-module ((guix build utils) #:select (call-with-temporary-output-file)) #:use-module ((guix store) #:select (%store-prefix store-path-package-name)) #:use-module ((guix search-paths) #:select (string-tokenize*)) #:use-module (srfi srfi-1) |