summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-05-06 18:44:24 +0200
committerAndreas Gruenbacher <agruen@suse.de>2010-05-06 18:44:24 +0200
commitd94b00785d85dae0c03583c3ef5710092cbf84d6 (patch)
tree1fc0402479d7f6f546337d7923021a9b706d86a6
parent7e9296614a86b04cfa96ef995d3f08cad87dde53 (diff)
downloadpatch-d94b00785d85dae0c03583c3ef5710092cbf84d6.tar.gz
test suite: Ignore error messages during cleanup
* tests/test-lib.sh: Ignore error messages when cleaning up after a test has finished.
-rw-r--r--ChangeLog5
-rw-r--r--tests/test-lib.sh6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 865fb83..1b3afc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-06 Andreas Gruenbacher <agruen@suse.de>
+
+ * tests/test-lib.sh: Ignore error messages when cleaning up after a
+ test has finished.
+
2009-05-05 Andreas Gruenbacher <agruen@suse.de>
* tests/test-lib.sh: Only use GNU diff when available.
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 0c7404a..712bcd4 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -111,10 +111,8 @@ cleanup() {
"$checks_failed failed)"
fi
if test -n "$tmpdir" ; then
- set -e
- cd /
- chmod -R u+rwx "$tmpdir"
- rm -rf "$tmpdir"
+ chmod -R u+rwx "$tmpdir" 2>/dev/null
+ cd / && rm -rf "$tmpdir"
fi
exit $status
}