[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: tests: Clean up after 'tests/guix-graph.sh'.
From: |
guix-commits |
Subject: |
05/08: tests: Clean up after 'tests/guix-graph.sh'. |
Date: |
Sun, 16 Jan 2022 17:59:27 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit a1037aa87b39d4c774fe398fc97a58bafeb063d1
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jan 16 23:33:58 2022 +0100
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 <ludo@gnu.org>
+# Copyright © 2015-2016, 2019-2020, 2022 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com>
#
# 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"<<EOF
- branch master updated (86e782e2b6 -> 4af273e0a8), guix-commits, 2022/01/16
- 03/08: import/github: Test it., guix-commits, 2022/01/16
- 04/08: gnu: ristretto: Update to 0.12.2., guix-commits, 2022/01/16
- 08/08: gnu: python-cftime: Update to 1.5.1.1., guix-commits, 2022/01/16
- 01/08: machine: ssh: Add 'safety-checks?' field., guix-commits, 2022/01/16
- 07/08: bash completion: Fix options completion., guix-commits, 2022/01/16
- 06/08: tests: Clean up after 'tests/guix-package-net.sh'., guix-commits, 2022/01/16
- 05/08: tests: Clean up after 'tests/guix-graph.sh'.,
guix-commits <=
- 02/08: import/github: Return <git-reference> objects for git-fetch origins., guix-commits, 2022/01/16