removing all entries of directory $tmp/a/a
removing the directory itself: $tmp/a/a
removing the directory itself: $tmp/a
-removing non-directory $tmp/b
+removing $tmp/b
EOF
if test $test_failure = 1; then
cat <<EOF > $tmp/$test.E
removing all entries of directory $tmp/a
removing all entries of directory $tmp/a/b
-removing non-directory $tmp/a/b/g
+removing $tmp/a/b/g
removing the directory itself: $tmp/a/b
-removing non-directory $tmp/a/f
+removing $tmp/a/f
removing the directory itself: $tmp/a
EOF