From a1037aa87b39d4c774fe398fc97a58bafeb063d1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 16 Jan 2022 23:33:58 +0100 Subject: 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. --- tests/guix-graph.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/guix-graph.sh b/tests/guix-graph.sh index 666660ab4b..e813e01c31 100644 --- a/tests/guix-graph.sh +++ b/tests/guix-graph.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2015, 2016, 2019, 2020 Ludovic Courtès +# Copyright © 2015-2016, 2019-2020, 2022 Ludovic Courtès # Copyright © 2019 Simon Tournier # # This file is part of GNU Guix. @@ -23,11 +23,10 @@ module_dir="t-guix-graph-$$" mkdir "$module_dir" -trap "rm -rf $module_dir" EXIT tmpfile1="$module_dir/t-guix-graph1-$$" tmpfile2="$module_dir/t-guix-graph2-$$" -trap 'rm -f "$tmpfile1" "$tmpfile2"' EXIT +trap 'rm -r "$module_dir"' EXIT cat > "$module_dir/foo.scm"<