From: Ralph Corderoy Date: Sun, 24 Sep 2017 12:12:46 +0000 (+0100) Subject: test/common.sh.in: Only rm(1) if the cd(1) succeeds. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/b793b5e976e7ece3588f1d0e69c9fe8234278783?ds=inline test/common.sh.in: Only rm(1) if the cd(1) succeeds. The rm specified the full path anyway, but if the cd fails for some odd reason then it's best not to continue. --- diff --git a/test/common.sh.in b/test/common.sh.in index 1dbbf2cc..e8660336 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -302,7 +302,7 @@ cleanup() { #### cd to $MH_TEST_DIR before trying to remove its Mail #### subdirectory. rm on Solaris won't remove it if it's in the #### path of the current working directory. - test -z "$MH_TEST_NOCLEANUP" && (cd "$MH_TEST_DIR"; rm -rf "$MH_TEST_DIR"/Mail) + test -z "$MH_TEST_NOCLEANUP" && (cd "$MH_TEST_DIR" && rm -rf "$MH_TEST_DIR"/Mail) #### Report test name if set, which indicates failure. #### Relies on set -e to invoke the trap which calls