tests: Clean up after 'tests/guix-graph.sh'.
Fixes a regression introduced in a773c3142dd168e1c4480614d3f5fd9d003954cd, which would lead the first 'trap' to be ignored, thereby leaving 't-guix-graph-*' directories behind it. * tests/guix-graph.sh: Remove first 'trap' line that had no effect; replace second 'trap' line.
This commit is contained in:
parent
7a0fffc85f
commit
a1037aa87b
@ -1,5 +1,5 @@
|
|||||||
# GNU Guix --- Functional package management for GNU
|
# GNU Guix --- Functional package management for GNU
|
||||||
# Copyright © 2015, 2016, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
# Copyright © 2015-2016, 2019-2020, 2022 Ludovic Courtès <ludo@gnu.org>
|
||||||
# Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com>
|
# Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
@ -23,11 +23,10 @@
|
|||||||
|
|
||||||
module_dir="t-guix-graph-$$"
|
module_dir="t-guix-graph-$$"
|
||||||
mkdir "$module_dir"
|
mkdir "$module_dir"
|
||||||
trap "rm -rf $module_dir" EXIT
|
|
||||||
|
|
||||||
tmpfile1="$module_dir/t-guix-graph1-$$"
|
tmpfile1="$module_dir/t-guix-graph1-$$"
|
||||||
tmpfile2="$module_dir/t-guix-graph2-$$"
|
tmpfile2="$module_dir/t-guix-graph2-$$"
|
||||||
trap 'rm -f "$tmpfile1" "$tmpfile2"' EXIT
|
trap 'rm -r "$module_dir"' EXIT
|
||||||
|
|
||||||
|
|
||||||
cat > "$module_dir/foo.scm"<<EOF
|
cat > "$module_dir/foo.scm"<<EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user