.

tests/rm/rm1

@@ -0,0 +1,45 @@
+#!/bin/sh
+# exercise another small part of remove.c
+
+if test "$VERBOSE" = yes; then
+  set -x
+  rm --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../lang-default
+PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+mkdir -p b/a/p b/c b/d || framework_failure=1
+chmod u-w b/a || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
+fail=0
+
+# This should fail.
+rm -rf b > out 2>&1 && fail=1
+cat <<EOF > exp
+rm: cannot remove \`b/a/p': Permission denied
+rm: cannot remove directory \`b': Directory not empty
+EOF
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+test -d b/a/p || fail=1
+test -d b/c && fail=1
+test -d b/d && fail=1
+
+(exit $fail); exit

tests/rm/rm2

@@ -0,0 +1,47 @@
+#!/bin/sh
+# exercise another small part of remove.c
+
+if test "$VERBOSE" = yes; then
+  set -x
+  rm --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../lang-default
+PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+mkdir -p a/1/2 b/3 || framework_failure=1
+chmod u-x a/1 b || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
+fail=0
+
+# Exercise two separate code paths -- though both result
+# in the same sort of diagnostic.
+# Both of these should fail.
+rm -rf a b > out 2>&1 && fail=1
+cat <<EOF > exp
+rm: cannot chdir from \`a/.' to \`1': Permission denied
+rm: cannot chdir from \`.' to \`b': Permission denied
+EOF
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+test -d a/1 || fail=1
+chmod u+x b
+test -d b/3 || fail=1
+
+(exit $fail); exit

tests/rm/rm3

@@ -0,0 +1,69 @@
+#!/bin/sh
+# exercise another small part of remove.c
+
+if test "$VERBOSE" = yes; then
+  set -x
+  rm --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../lang-default
+PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+mkdir -p z || framework_failure=1
+cd z || framework_failure=1
+touch f fu || framework_failure=1
+ln -s f slink
+ln -s . slinkdot
+mkdir d du || framework_failure=1
+chmod u-w fu du || framework_failure=1
+cd ..
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
+fail=0
+
+cat <<EOF > in
+y
+y
+y
+y
+y
+y
+y
+y
+EOF
+
+# Both of these should fail.
+rm -ir z < in > out 2>&1 || fail=1
+tr '?' '\012' < out |sed 's/^ //' |sort > o2
+mv o2 out
+
+sort <<EOF > exp || fail=1
+rm: descend into directory \`z'
+rm: remove regular file \`z/f'
+rm: remove write-protected regular file \`z/fu'
+rm: remove symbolic link \`z/slink'
+rm: remove symbolic link \`z/slinkdot'
+rm: remove directory \`z/d'
+rm: remove write-protected directory \`z/du'
+rm: remove directory \`z'
+EOF
+
+cmp out exp || fail=1
+test $fail = 1 && diff -u out exp 2> /dev/null
+
+test -d z && fail=1
+
+(exit $fail); exit

tests/rm/rm4

@@ -0,0 +1,35 @@
+#!/bin/sh
+# ensure that `rm dir' fails without --recursive
+
+if test "$VERBOSE" = yes; then
+  set -x
+  rm --version
+fi
+
+. $srcdir/../envvar-check
+. $srcdir/../lang-default
+PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+mkdir dir || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo '$0: failure in testing framework' 1>&2
+  (exit 1); exit
+fi
+
+fail=0
+
+# This should fail.
+rm dir > /dev/null 2>&1 && fail=1
+
+test -d dir || fail=1
+
+(exit $fail); exit