summaryrefslogtreecommitdiff
path: root/tests/rm/interactive-always
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-01-23 14:42:10 +0100
committerJim Meyering <meyering@redhat.com>2012-01-23 14:42:10 +0100
commitdec02bb98ec59fc1a5a0ed6ae1dda2bda69af111 (patch)
tree84578716de23a06630790d4d1cf7221654b94275 /tests/rm/interactive-always
parent80bc8651fd6b0a41be00ab4ee82e920287b15cbc (diff)
downloadcoreutils-dec02bb98ec59fc1a5a0ed6ae1dda2bda69af111.tar.xz
tests: remove crufty test=test_name code from old tests
Before init.sh and similar, we would set test=test_name, and then construct temporary file names using $test. Now that each init.sh-using test is in its own directory, that practice is unwelcome. Remove bad examples. * tests/rm/f-1: Per above. * tests/rm/i-1: Likewise. * tests/rm/interactive-always: Likewise. * tests/rm/interactive-once: Likewise. * tests/rm/ir-1: Likewise. * tests/rm/r-1: Likewise.
Diffstat (limited to 'tests/rm/interactive-always')
-rwxr-xr-xtests/rm/interactive-always16
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always
index 41c8f4131..6312cba1c 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -16,8 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-test=interactive-always
-
. "${srcdir=.}/init.sh"; path_prepend_ ../src
print_ver_ rm
@@ -25,7 +23,7 @@ touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \
|| framework_failure_
# If asked, answer no to first question, then yes to second.
echo 'n
-y' > $test.I || framework_failure_
+y' > in || framework_failure_
rm -f out err || framework_failure_
@@ -33,36 +31,36 @@ rm -f out err || framework_failure_
# 'echo .' is inserted after each rm to make it obvious what was asked.
echo 'no WHEN' > err || fail=1
-rm -R --interactive file1-* < $test.I >> out 2>> err || fail=1
+rm -R --interactive file1-* < in >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file1-1 || fail=1
test -f file1-2 && fail=1
echo 'WHEN=never' >> err || fail=1
-rm -R --interactive=never file2-* < $test.I >> out 2>> err || fail=1
+rm -R --interactive=never file2-* < in >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file2-1 && fail=1
test -f file2-2 && fail=1
echo 'WHEN=once' >> err || fail=1
-rm -R --interactive=once file3-* < $test.I >> out 2>> err || fail=1
+rm -R --interactive=once file3-* < in >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file3-1 || fail=1
test -f file3-2 || fail=1
echo 'WHEN=always' >> err || fail=1
-rm -R --interactive=always file4-* < $test.I >> out 2>> err || fail=1
+rm -R --interactive=always file4-* < in >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file4-1 || fail=1
test -f file4-2 && fail=1
echo '-f overrides --interactive' >> err || fail=1
-rm -R --interactive=once -f file1-* < $test.I >> out 2>> err || fail=1
+rm -R --interactive=once -f file1-* < in >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file1-1 && fail=1
echo '--interactive overrides -f' >> err || fail=1
-rm -R -f --interactive=once file4-* < $test.I >> out 2>> err || fail=1
+rm -R -f --interactive=once file4-* < in >> out 2>> err || fail=1
echo . >> err || fail=1
test -f file4-1 || fail=1