diff options
| author | Jim Meyering <jim@meyering.net> | 2007-01-17 17:02:40 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-01-17 17:15:20 +0100 |
| commit | 0928c2414ab21682600e6572bc628a405fb1ea80 (patch) | |
| tree | ff030e34af21eb8a8252af6773e54848e18df05b /tests | |
| parent | d1ad73e0bf6a1b6c62e424c1f28cf344fca10600 (diff) | |
| download | coreutils-0928c2414ab21682600e6572bc628a405fb1ea80.tar.xz | |
Make "rm --interactive=never ..." never prompt.
* NEWS: Mention this.
* src/remove.h (enum rm_interactive): New ternary type.
(struct rm_options) [interactive]: Use it, here -- rather than bool.
* src/remove.c (prompt): Reflect type change.
* src/mv.c (rm_option_init): Initialize to RMI_NEVER now.
* src/rm.c (main): Add a FIXME comment for '-d' option.
Adapt to type change of rm_options.interactive.
* tests/rm/i-never: New file. Test for the above fix.
* tests/rm/Makefile.am (TESTS): Add i-never.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rm/Makefile.am | 3 | ||||
| -rwxr-xr-x | tests/rm/i-never | 53 |
2 files changed, 55 insertions, 1 deletions
diff --git a/tests/rm/Makefile.am b/tests/rm/Makefile.am index ff31f7518..4c212b9d6 100644 --- a/tests/rm/Makefile.am +++ b/tests/rm/Makefile.am @@ -1,6 +1,6 @@ # Make coreutils tests for "rm". -*-Makefile-*- -# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -21,6 +21,7 @@ AUTOMAKE_OPTIONS = 1.1 gnits TESTS = \ + i-never \ fail-eacces \ one-file-system \ ignorable \ diff --git a/tests/rm/i-never b/tests/rm/i-never new file mode 100755 index 000000000..f20e90e78 --- /dev/null +++ b/tests/rm/i-never @@ -0,0 +1,53 @@ +#!/bin/sh +# Ensure that rm --interactive=never works does not prompt, even for +# an unwritable file. + +# Copyright (C) 2007 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +if test "$VERBOSE" = yes; then + set -x + rm --version +fi + +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 +touch f || framework_failure=1 +chmod 0 f || framework_failure=1 +touch exp || framework_failure=1 + +if test $framework_failure = 1; then + echo "$0: failure in testing framework" 1>&2 + (exit 1); exit 1 +fi + +fail=0 + +rm --interactive=never f > out || fail=1 + +cmp out exp || fail=1 +test $fail = 1 && diff out exp 2> /dev/null + +(exit $fail); exit $fail |