diff options
author | Jim Meyering <meyering@redhat.com> | 2011-11-22 10:08:04 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-11-22 10:35:03 +0100 |
commit | a2c811db420717d61bf948afdd879454d9187d38 (patch) | |
tree | d2a82ad94d4674069a72a6a162d00bb6694d431b /tests/misc/tr-case-class | |
parent | 9d98634b3908786bb048b72624da244e681f87b9 (diff) | |
download | coreutils-a2c811db420717d61bf948afdd879454d9187d38.tar.xz |
tests: use "compare exp out", not "compare out exp"
Likewise, when an empty file is expected, use "compare /dev/null out",
not "compare out /dev/null". I.e., specify the expected/desired contents
via the first file name. Prompted by a suggestion from Bruno Haible
in http://thread.gmane.org/gmane.comp.gnu.grep.bugs/4020/focus=29154
Run these commands:
git grep -l -E 'compare [^ ]+ exp' \
|xargs perl -pi -e 's/(compare) (\S+) (exp\S*)/$1 $3 $2/'
git grep -l -E 'compare [^ ]+ /dev/null' \
|xargs perl -pi -e 's/(compare) (\S+) (\/dev\/null)/$1 $3 $2/'
* tests/chgrp/no-x: As above.
* tests/chmod/no-x: Likewise.
* tests/chmod/silent: Likewise.
* tests/chmod/thru-dangling: Likewise.
* tests/chown/basic: Likewise.
* tests/chown/deref: Likewise.
* tests/chown/preserve-root: Likewise.
* tests/cp/abuse: Likewise.
* tests/cp/backup-is-src: Likewise.
* tests/cp/cp-a-selinux: Likewise.
* tests/cp/cp-mv-enotsup-xattr: Likewise.
* tests/cp/fail-perm: Likewise.
* tests/cp/into-self: Likewise.
* tests/cp/proc-zero-len: Likewise.
* tests/cp/src-base-dot: Likewise.
* tests/cp/thru-dangling: Likewise.
* tests/dd/reblock: Likewise.
* tests/dd/unblock-sync: Likewise.
* tests/du/2g: Likewise.
* tests/du/8gb: Likewise.
* tests/du/basic: Likewise.
* tests/du/bigtime: Likewise.
* tests/du/deref-args: Likewise.
* tests/du/exclude: Likewise.
* tests/du/files0-from-dir: Likewise.
* tests/du/hard-link: Likewise.
* tests/du/inacc-dest: Likewise.
* tests/du/inacc-dir: Likewise.
* tests/du/long-sloop: Likewise.
* tests/du/max-depth: Likewise.
* tests/du/move-dir-while-traversing: Likewise.
* tests/du/no-deref: Likewise.
* tests/du/no-x: Likewise.
* tests/du/one-file-system: Likewise.
* tests/du/slash: Likewise.
* tests/du/trailing-slash: Likewise.
* tests/install/strip-program: Likewise.
* tests/ln/hard-backup: Likewise.
* tests/ls/block-size: Likewise.
* tests/ls/color-clear-to-eol: Likewise.
* tests/ls/color-dtype-dir: Likewise.
* tests/ls/color-norm: Likewise.
* tests/ls/dangle: Likewise.
* tests/ls/dired: Likewise.
* tests/ls/file-type: Likewise.
* tests/ls/follow-slink: Likewise.
* tests/ls/infloop: Likewise.
* tests/ls/m-option: Likewise.
* tests/ls/no-arg: Likewise.
* tests/ls/recursive: Likewise.
* tests/ls/rt-1: Likewise.
* tests/ls/stat-dtype: Likewise.
* tests/ls/stat-failed: Likewise.
* tests/ls/stat-free-symlinks: Likewise.
* tests/ls/x-option: Likewise.
* tests/misc/arch: Likewise.
* tests/misc/cat-buf: Likewise.
* tests/misc/cat-proc: Likewise.
* tests/misc/chcon: Likewise.
* tests/misc/csplit: Likewise.
* tests/misc/df-P: Likewise.
* tests/misc/fmt-long-line: Likewise.
* tests/misc/groups-dash: Likewise.
* tests/misc/groups-version: Likewise.
* tests/misc/head-pos: Likewise.
* tests/misc/nl: Likewise.
* tests/misc/od-N: Likewise.
* tests/misc/od-multiple-t: Likewise.
* tests/misc/od-x8: Likewise.
* tests/misc/printf: Likewise.
* tests/misc/printf-hex: Likewise.
* tests/misc/pwd-option: Likewise.
* tests/misc/readlink-fp-loop: Likewise.
* tests/misc/runcon-no-reorder: Likewise.
* tests/misc/seq-long-double: Likewise.
* tests/misc/sort-NaN-infloop: Likewise.
* tests/misc/sort-benchmark-random: Likewise.
* tests/misc/sort-debug-keys: Likewise.
* tests/misc/sort-float: Likewise.
* tests/misc/sort-merge-fdlimit: Likewise.
* tests/misc/sort-unique-segv: Likewise.
* tests/misc/stat-hyphen: Likewise.
* tests/misc/stat-slash: Likewise.
* tests/misc/stdbuf: Likewise.
* tests/misc/sum-sysv: Likewise.
* tests/misc/tac-2-nonseekable: Likewise.
* tests/misc/tac-continue: Likewise.
* tests/misc/tr-case-class: Likewise.
* tests/misc/truncate-fail-diag: Likewise.
* tests/misc/wc-files0: Likewise.
* tests/mkdir/selinux: Likewise.
* tests/mv/backup-dir: Likewise.
* tests/mv/backup-is-src: Likewise.
* tests/mv/diag: Likewise.
* tests/mv/dir2dir: Likewise.
* tests/mv/dup-source: Likewise.
* tests/mv/force: Likewise.
* tests/mv/hard-verbose: Likewise.
* tests/mv/i-link-no: Likewise.
* tests/mv/into-self: Likewise.
* tests/mv/into-self-2: Likewise.
* tests/mv/into-self-3: Likewise.
* tests/mv/mv-special-1: Likewise.
* tests/mv/part-fail: Likewise.
* tests/mv/perm-1: Likewise.
* tests/mv/sticky-to-xpart: Likewise.
* tests/mv/trailing-slash: Likewise.
* tests/rm/rm1: Likewise.
* tests/rm/rm2: Likewise.
* tests/rm/cycle: Likewise.
* tests/rm/dir-no-w: Likewise.
* tests/rm/dir-nonrecur: Likewise.
* tests/rm/fail-2eperm: Likewise.
* tests/rm/fail-eacces: Likewise.
* tests/rm/i-never: Likewise.
* tests/rm/inaccessible: Likewise.
* tests/rm/interactive-always: Likewise.
* tests/rm/interactive-once: Likewise.
* tests/rm/isatty: Likewise.
* tests/rm/one-file-system: Likewise.
* tests/rm/rm3: Likewise.
* tests/rm/rm5: Likewise.
* tests/rm/unread2: Likewise.
* tests/rm/v-slash: Likewise.
* tests/sample-test: Likewise.
* tests/split/b-chunk: Likewise.
* tests/split/fail: Likewise.
* tests/split/l-chunk: Likewise.
* tests/split/lines: Likewise.
* tests/split/r-chunk: Likewise.
* tests/split/suffix-length: Likewise.
* tests/tail-2/big-4gb: Likewise.
* tests/tail-2/follow-name: Likewise.
* tests/tail-2/follow-stdin: Likewise.
* tests/tail-2/pipe-f: Likewise.
* tests/tail-2/pipe-f2: Likewise.
* tests/tail-2/start-middle: Likewise.
* tests/touch/60-seconds: Likewise.
* tests/touch/fail-diag: Likewise.
* tests/touch/not-owner: Likewise.
* tests/touch/relative: Likewise.
Diffstat (limited to 'tests/misc/tr-case-class')
-rwxr-xr-x | tests/misc/tr-case-class | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/misc/tr-case-class b/tests/misc/tr-case-class index 92f1a576c..680f25a11 100755 --- a/tests/misc/tr-case-class +++ b/tests/misc/tr-case-class @@ -23,10 +23,10 @@ print_ver_ tr echo '01234567899999999999999999' > exp echo 'abcdefghijklmnopqrstuvwxyz' | tr '[:lower:]' '0-9' > out || fail=1 -compare out exp || fail=1 +compare exp out || fail=1 echo 'abcdefghijklmnopqrstuvwxyz' | tr '[:lower:][:lower:]' '[:upper:]0-9' > out || fail=1 -compare out exp || fail=1 +compare exp out || fail=1 # Validate the alignment of case classes tr 'A-Z[:lower:]' 'a-y[:upper:]' < /dev/null && fail=1 @@ -44,21 +44,21 @@ tr '[:upper:][:lower:]' '[:upper:]a-z' < /dev/null || fail=1 tr '[:upper:] ' '[:lower:]' < /dev/null 2>out && fail=1 echo 'tr: when translating with string1 longer than string2, the latter string must not end with a character class' > exp -compare out exp || fail=1 +compare exp out || fail=1 # Up to coreutils-6.9, tr rejected an unmatched [:lower:] or [:upper:] in SET1. echo '#$%123abcABC' | tr '[:lower:]' '[.*]' > out || fail=1 echo '#$%123...ABC' > exp -compare out exp || fail=1 +compare exp out || fail=1 echo '#$%123abcABC' | tr '[:upper:]' '[.*]' > out || fail=1 echo '#$%123abc...' > exp -compare out exp || fail=1 +compare exp out || fail=1 # When doing a case-converting translation with something after the # [:upper:] and [:lower:] elements, ensure that tr honors the following byte. echo 'abc.' | tr '[:lower:].' '[:upper:]x' > out || fail=1 echo 'ABCx' > exp -compare out exp || fail=1 +compare exp out || fail=1 # Before coreutils 8.6 the disparate number of upper and lower # characters in some locales, triggered abort()s and invalid behavior @@ -73,41 +73,41 @@ if test "$(locale charmap 2>/dev/null)" = ISO-8859-1; then tr '[:upper:] ' '[:lower:]' < /dev/null 2>out && fail=1 echo 'tr: when translating with string1 longer than string2, the latter string must not end with a character class' > exp - compare out exp || fail=1 + compare exp out || fail=1 # Ensure when there are a different number of elements # in each string, we validate the case mapping correctly echo 'abc.xyz' | tr 'ab[:lower:]' '0-1[:upper:]' > out || fail=1 echo 'ABC.XYZ' > exp - compare out exp || fail=1 + compare exp out || fail=1 # Ensure we extend string2 appropriately echo 'ABC- XYZ' | tr '[:upper:]- ' '[:lower:]_' > out || fail=1 echo 'abc__xyz' > exp - compare out exp || fail=1 + compare exp out || fail=1 # Ensure the size of the case classes are accounted # for as a unit. echo 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr '[:upper:]A-B' '[:lower:]0' >out || fail=1 echo '00cdefghijklmnopqrstuvwxyz' > exp - compare out exp || fail=1 + compare exp out || fail=1 # Ensure the size of the case classes are accounted # for as a unit. echo 'a' | tr -t '[:lower:]a' '[:upper:]0' >out || fail=1 echo '0' > exp - compare out exp || fail=1 + compare exp out || fail=1 # Ensure the size of the case classes are accounted # for as a unit. echo 'a' | tr -t '[:lower:][:lower:]a' '[:lower:][:upper:]0' >out || fail=1 echo '0' > exp - compare out exp || fail=1 + compare exp out || fail=1 fi Exit $fail |