diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-build.sh | 9 | ||||
| -rw-r--r-- | tests/packages.scm | 5 | ||||
| -rw-r--r-- | tests/store-roots.scm | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 317c58ac42..4eab0e38b6 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012-2014, 2016-2022 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012-2014, 2016-2023 Ludovic Courtès <ludo@gnu.org> # Copyright © 2020 Marius Bakke <mbakke@fastmail.com> # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> # @@ -397,6 +397,13 @@ guix build -d -m "$module_dir/manifest.scm" \ rm "$module_dir"/*.scm +if [ -n "$BASH_VERSION" ] +then + # Check whether we can load from a /dev/fd/N denoting a pipe, using this + # handy Bash-specific construct. + guix build -m <(echo '(specifications->manifest (list "guile"))') -n +fi + # Using 'GUIX_BUILD_OPTIONS'. GUIX_BUILD_OPTIONS="--dry-run --no-grafts" export GUIX_BUILD_OPTIONS diff --git a/tests/packages.scm b/tests/packages.scm index 2b7ab01f7d..2b4f9f8e90 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1277,8 +1277,9 @@ ;; #:guile guile)))) (test-equal "package->bag" - `("foo86-hurd" #f (,(package-source gnu-make)) - (,(canonical-package glibc)) (,(canonical-package coreutils))) + (parameterize ((%current-system "foo86-hurd")) + `("foo86-hurd" #f (,(package-source gnu-make)) + (,(canonical-package glibc)) (,(canonical-package coreutils)))) (let ((bag (package->bag gnu-make "foo86-hurd"))) (list (bag-system bag) (bag-target bag) (assoc-ref (bag-build-inputs bag) "source") diff --git a/tests/store-roots.scm b/tests/store-roots.scm index 9877987a65..bf30b1dff6 100644 --- a/tests/store-roots.scm +++ b/tests/store-roots.scm @@ -30,13 +30,6 @@ (test-begin "store-roots") -(test-equal "gc-roots, initial" - (list (string-append %state-directory "/profiles")) - (begin - ;; 'gc-roots' should gracefully handle lack of that directory. - (delete-file-recursively (string-append %state-directory "/profiles")) - (gc-roots))) - ;; The 'open-connection' call below gets guix-daemon to create ;; %STATE-DIRECTORY/profiles. (set! %store (open-connection)) |