mirror of git://git.savannah.gnu.org/guix.git
tests: Avoid three-argument ‘test-assertm’.
This fixes a discrepancy with other tests that have a two-argument ‘test-assertm’ macro. * tests/pack.scm (test-assertm): Move within ‘with-external-store’, and remove ‘store’ parameter.
This commit is contained in:
parent
47e265af75
commit
2aa45d0347
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2017-2021, 2023 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
|
@ -46,12 +46,6 @@
|
||||||
;; Globally disable grafts because they can trigger early builds.
|
;; Globally disable grafts because they can trigger early builds.
|
||||||
(%graft? #f)
|
(%graft? #f)
|
||||||
|
|
||||||
(define-syntax-rule (test-assertm name store exp)
|
|
||||||
(test-assert name
|
|
||||||
(let ((guile (package-derivation store %bootstrap-guile)))
|
|
||||||
(run-with-store store exp
|
|
||||||
#:guile-for-build guile))))
|
|
||||||
|
|
||||||
(define %gzip-compressor
|
(define %gzip-compressor
|
||||||
;; Compressor that uses the bootstrap 'gzip'.
|
;; Compressor that uses the bootstrap 'gzip'.
|
||||||
((@ (guix scripts pack) compressor) "gzip"
|
((@ (guix scripts pack) compressor) "gzip"
|
||||||
|
@ -82,8 +76,14 @@
|
||||||
;; dependencies may be already there, or we can get substitutes or build them
|
;; dependencies may be already there, or we can get substitutes or build them
|
||||||
;; quite inexpensively; see <https://bugs.gnu.org/32184>.
|
;; quite inexpensively; see <https://bugs.gnu.org/32184>.
|
||||||
(with-external-store store
|
(with-external-store store
|
||||||
|
(define-syntax-rule (test-assertm name exp)
|
||||||
|
(test-assert name
|
||||||
|
(let ((guile (package-derivation store %bootstrap-guile)))
|
||||||
|
(run-with-store store exp
|
||||||
|
#:guile-for-build guile))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "self-contained-tarball" store
|
(test-assertm "self-contained-tarball"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(profile -> (profile
|
(profile -> (profile
|
||||||
|
@ -136,7 +136,7 @@
|
||||||
(built-derivations (list check))))
|
(built-derivations (list check))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "self-contained-tarball + localstatedir" store
|
(test-assertm "self-contained-tarball + localstatedir"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(profile -> (profile
|
(profile -> (profile
|
||||||
|
@ -159,7 +159,7 @@
|
||||||
(built-derivations (list check))))
|
(built-derivations (list check))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "self-contained-tarball + localstatedir, UTF-8 file names" store
|
(test-assertm "self-contained-tarball + localstatedir, UTF-8 file names"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(tree (interned-file-tree
|
(tree (interned-file-tree
|
||||||
|
@ -210,7 +210,7 @@
|
||||||
(built-derivations (list check))))
|
(built-derivations (list check))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "docker-image + localstatedir" store
|
(test-assertm "docker-image + localstatedir"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(profile -> (profile
|
(profile -> (profile
|
||||||
|
@ -250,7 +250,7 @@
|
||||||
(built-derivations (list check))))
|
(built-derivations (list check))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "squashfs-image + localstatedir" store
|
(test-assertm "squashfs-image + localstatedir"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(profile -> (profile
|
(profile -> (profile
|
||||||
|
@ -289,7 +289,7 @@
|
||||||
(built-derivations (list check))))
|
(built-derivations (list check))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "deb archive with symlinks and control files" store
|
(test-assertm "deb archive with symlinks and control files"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(profile -> (profile
|
(profile -> (profile
|
||||||
|
@ -378,7 +378,7 @@
|
||||||
(built-derivations (list check))))
|
(built-derivations (list check))))
|
||||||
|
|
||||||
(unless store (test-skip 1))
|
(unless store (test-skip 1))
|
||||||
(test-assertm "rpm archive can be installed/uninstalled" store
|
(test-assertm "rpm archive can be installed/uninstalled"
|
||||||
(mlet* %store-monad
|
(mlet* %store-monad
|
||||||
((guile (set-guile-for-build (default-guile)))
|
((guile (set-guile-for-build (default-guile)))
|
||||||
(profile -> (profile
|
(profile -> (profile
|
||||||
|
|
Loading…
Reference in New Issue