me/guix
Archived
1
0
Fork 0
Code Activity

tests: Clean up after 'tests/guix-package-net.sh'.

Browse source 
* tests/guix-package-net.sh: Remove second 'trap' line.  Change first
'trap' line to remove "$module_dir" and *.lock files.
This commit is contained in:
Ludovic Courtès 2022-01-16 23:42:07 +01:00
parent a1037aa87b
commit 686f2eae34
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/guix-package-net.sh
View file

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2017, 2019 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012-2015, 2017, 2019, 2022 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> # Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> # Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
# #
@ -50,7 +50,10 @@ profile="t-profile-$$"
profile_alt="t-profile-alt-$$" profile_alt="t-profile-alt-$$"
rm -f "$profile" rm -f "$profile"
trap 'rm -f "$profile" "$profile_alt" "$profile-"[0-9]* "$profile_alt-"[0-9]* ; rm -rf t-home-'"$$" EXIT module_dir="t-guix-package-net-$$"
mkdir "$module_dir"
trap 'rm -f "$profile" "$profile_alt" "$profile.lock" "$profile_alt.lock" "$profile-"[0-9]* "$profile_alt-"[0-9]* ; rm -r "$module_dir" t-home-'"$$" EXIT
guix package --bootstrap -p "$profile" -i guile-bootstrap guix package --bootstrap -p "$profile" -i guile-bootstrap
@ -177,10 +180,6 @@ guix package -p "$profile" -p "$profile_alt" --search-paths \
| grep "LIBRARY_PATH.*$profile/lib.$profile_alt/lib" | grep "LIBRARY_PATH.*$profile/lib.$profile_alt/lib"
# Simulate an upgrade and make sure the package order is preserved. # Simulate an upgrade and make sure the package order is preserved.
module_dir="t-guix-package-net-$$"
trap 'rm -rf "$module_dir"' EXIT
mkdir "$module_dir"
cat > "$module_dir/new.scm" <<EOF cat > "$module_dir/new.scm" <<EOF
(define-module (new) (define-module (new)
#:use-module (guix) #:use-module (guix)