diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/crate.scm | 40 | ||||
| -rw-r--r-- | tests/guix-system.sh | 4 | ||||
| -rw-r--r-- | tests/pack.scm | 28 |
3 files changed, 45 insertions, 27 deletions
diff --git a/tests/crate.scm b/tests/crate.scm index 720fcb212c..5aea5efaf3 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 David Craven <[email protected]> ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès <[email protected]> ;;; Copyright © 2020 Martin Becze <[email protected]> +;;; Copyright © 2023 Efraim Flashner <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,21 +77,24 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/foo/0.8.1/dependencies\" - } + }, + \"yanked\": false }, { \"id\": 234212, \"num\": \"1.0.0\", \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/foo/1.0.0/dependencies\" - } + }, + \"yanked\": false }, { \"id\": 234214, \"num\": \"1.0.3\", \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/foo/1.0.3/dependencies\" - } + }, + \"yanked\": false } ] } @@ -123,14 +127,16 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/root/1.0.0/dependencies\" - } + }, + \"yanked\": false }, { \"id\": 234242, \"num\": \"1.0.4\", \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/root/1.0.4/dependencies\" - } + }, + \"yanked\": false } ] } @@ -178,21 +184,24 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/intermediate-a/1.0.40/dependencies\" - } + }, + \"yanked\": false }, { \"id\": 234250, \"num\": \"1.0.42\", \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/intermediate-a/1.0.42/dependencies\" - } + }, + \"yanked\": false }, { \"id\": 234252, \"num\": \"1.1.0-alpha.1\", \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/intermediate-a/1.1.0-alpha.1/dependencies\" - } + }, + \"yanked\": false } ] } @@ -235,7 +244,8 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/intermediate-b/1.2.3/dependencies\" - } + }, + \"yanked\": false } ] } @@ -268,14 +278,16 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/leaf-alice/0.7.3/dependencies\" - } + }, + \"yanked\": false }, { \"id\": 234272, \"num\": \"0.7.5\", \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/leaf-alice/0.7.5/dependencies\" - } + }, + \"yanked\": false } ] } @@ -302,7 +314,8 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/leaf-bob/3.0.1/dependencies\" - } + }, + \"yanked\": false } ] } @@ -597,7 +610,8 @@ \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/doctool/2.2.2/dependencies\" - } + }, + \"yanked\": false } ] } diff --git a/tests/guix-system.sh b/tests/guix-system.sh index adc0c44a6f..29e490c3d4 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -346,6 +346,10 @@ for example in gnu/system/examples/*.tmpl; do # The Raspberry Pi templates 'linux-libre-arm64-generic', which is # an ARM-only package. options="--system=aarch64-linux";; + *plasma*) + # Some architectures do not support all the packages Plasma + # depends on so restrict to x86_64-linux. + options="--system=x86_64-linux";; *vm-image*) # The VM image tries to build 'current-guix' as per 'guix pull'. # Skip it. diff --git a/tests/pack.scm b/tests/pack.scm index cf249f861b..8fdaed0168 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <[email protected]> +;;; Copyright © 2017-2021, 2023 Ludovic Courtès <[email protected]> ;;; Copyright © 2018 Ricardo Wurmus <[email protected]> ;;; Copyright © 2021, 2023 Maxim Cournoyer <[email protected]> ;;; @@ -46,12 +46,6 @@ ;; Globally disable grafts because they can trigger early builds. (%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 ;; Compressor that uses the bootstrap 'gzip'. ((@ (guix scripts pack) compressor) "gzip" @@ -82,8 +76,14 @@ ;; dependencies may be already there, or we can get substitutes or build them ;; quite inexpensively; see <https://bugs.gnu.org/32184>. (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)) - (test-assertm "self-contained-tarball" store + (test-assertm "self-contained-tarball" (mlet* %store-monad ((guile (set-guile-for-build (default-guile))) (profile -> (profile @@ -136,7 +136,7 @@ (built-derivations (list check)))) (unless store (test-skip 1)) - (test-assertm "self-contained-tarball + localstatedir" store + (test-assertm "self-contained-tarball + localstatedir" (mlet* %store-monad ((guile (set-guile-for-build (default-guile))) (profile -> (profile @@ -159,7 +159,7 @@ (built-derivations (list check)))) (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 ((guile (set-guile-for-build (default-guile))) (tree (interned-file-tree @@ -210,7 +210,7 @@ (built-derivations (list check)))) (unless store (test-skip 1)) - (test-assertm "docker-image + localstatedir" store + (test-assertm "docker-image + localstatedir" (mlet* %store-monad ((guile (set-guile-for-build (default-guile))) (profile -> (profile @@ -250,7 +250,7 @@ (built-derivations (list check)))) (unless store (test-skip 1)) - (test-assertm "squashfs-image + localstatedir" store + (test-assertm "squashfs-image + localstatedir" (mlet* %store-monad ((guile (set-guile-for-build (default-guile))) (profile -> (profile @@ -289,7 +289,7 @@ (built-derivations (list check)))) (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 ((guile (set-guile-for-build (default-guile))) (profile -> (profile @@ -378,7 +378,7 @@ (built-derivations (list check)))) (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 ((guile (set-guile-for-build (default-guile))) (profile -> (profile |