summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Voelker <mail@bernhard-voelker.de>2013-11-22 15:54:06 +0100
committerBernhard Voelker <mail@bernhard-voelker.de>2013-11-22 15:54:06 +0100
commit2fa074ebd43cbfea0f6b4bc92a4099a273458562 (patch)
tree4f39f73ada386a63d15cfabccd327a268795dabb
parenteb8b45f443380b496d82f1976a7203d6c7828db5 (diff)
downloadcoreutils-2fa074ebd43cbfea0f6b4bc92a4099a273458562.tar.xz
tests: enhance rm test regarding "." and ".."
Recent commit 2da7009d changed the error diagnostic of rm(1) trying to remove "." or "..". Enhance the corresponding test. * tests/rm/r-4.sh: Ensure rm(1) outputs the expected error diagnostic.
-rwxr-xr-xtests/rm/r-4.sh25
1 files changed, 20 insertions, 5 deletions
diff --git a/tests/rm/r-4.sh b/tests/rm/r-4.sh
index 94702a6d1..a3ceaf985 100755
--- a/tests/rm/r-4.sh
+++ b/tests/rm/r-4.sh
@@ -22,11 +22,26 @@ print_ver_ rm
mkdir d || framework_failure_
touch d/a || framework_failure_
-rm -fr d/. 2>/dev/null && fail=1
-rm -fr d/./ 2>/dev/null && fail=1
-rm -fr d/.//// 2>/dev/null && fail=1
-rm -fr d/.. 2>/dev/null && fail=1
-rm -fr d/../ 2>/dev/null && fail=1
+# Expected error diagnostic as grep pattern.
+exp="^rm: refusing to remove '\.' or '\.\.' directory: skipping '.*'\$"
+
+rmtest()
+{
+ # Try removing - expecting failure.
+ rm -fr "$1" 2> err && fail=1
+
+ # Ensure the expected error diagnostic is output.
+ grep "$exp" err || { cat err; fail=1; }
+
+ return $fail
+}
+
+rmtest 'd/.' || fail=1
+rmtest 'd/./' || fail=1
+rmtest 'd/.////' || fail=1
+rmtest 'd/..' || fail=1
+rmtest 'd/../' || fail=1
+
# This test is too dangerous -- if there's a bug you're wiped out!
# rm -fr / 2>/dev/null && fail=1