diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-01-23 14:42:10 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-01-23 14:42:10 +0100 |
| commit | dec02bb98ec59fc1a5a0ed6ae1dda2bda69af111 (patch) | |
| tree | 84578716de23a06630790d4d1cf7221654b94275 /tests/rm/r-1 | |
| parent | 80bc8651fd6b0a41be00ab4ee82e920287b15cbc (diff) | |
| download | coreutils-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/r-1')
| -rwxr-xr-x | tests/rm/r-1 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/rm/r-1 b/tests/rm/r-1 index 97d0959c1..6fded413e 100755 --- a/tests/rm/r-1 +++ b/tests/rm/r-1 @@ -17,29 +17,25 @@ # 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=r-1 - . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ rm mkdir a a/a || framework_failure_ > b || framework_failure_ -cat <<\EOF > $test.E || framework_failure_ +cat <<\EOF > exp || framework_failure_ removed directory: 'a/a' removed directory: 'a' removed 'b' EOF -rm --verbose -r a b > $test.O || fail=1 +rm --verbose -r a b > out || fail=1 for d in $dirs; do - if test -d $d; then - fail=1 - fi + test -d $d && fail=1 done # Compare expected and actual output. -compare $test.E $test.O || fail=1 +compare exp out || fail=1 Exit $fail |