diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-01-07 20:55:10 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-01-09 21:50:08 +0100 |
| commit | ae2b0d2ddca458eb282bb0458987e75e1875a659 (patch) | |
| tree | de928bfafb577a20963be45b4b6d97488c0b5e24 /tests/misc/tail | |
| parent | dd0e4c5621ca2fa9255aef4eee0e7cf41cd335d2 (diff) | |
| download | coreutils-ae2b0d2ddca458eb282bb0458987e75e1875a659.tar.xz | |
tests: more automated quote adjustment
Relax initial regexp to match more instances, but add a
filter to avoid some invalid conversions. Run this:
git grep -l "\`[^']*'" tests | xargs perl -pi -e '$q=q"'\''";' \
-e '$q="$q\\$q$q"; /(= ?\`|\`expr|\`echo|\Q$q\E)/ and next;' \
-e ' s/\`([^'\''"]*?'\'')/'\''$1/g'
The last disjunct in the above (...) filter is to exempt
any line that contains this string: '\''
With quoting like that, converting a ` to ' is likely to cause trouble,
so we'll handle those manually. Here are three examples where
the exemption is required:
*': `link-to-dir/'\'': hard link not allowed for directory'*) ;;
printf 'creating file `%s'\''\n' $f
'mv: inter-device move failed: `%s'\'' to `%s'\'';'\
Diffstat (limited to 'tests/misc/tail')
| -rwxr-xr-x | tests/misc/tail | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/misc/tail b/tests/misc/tail index 910297664..41c2f9a99 100755 --- a/tests/misc/tail +++ b/tests/misc/tail @@ -56,13 +56,13 @@ my @tv = ( ['obs-b', '-b', "x\n" x (512 * 10 / 2 + 1), "x\n" x (512 * 10 / 2), 0], ['err-1', '+cl', '', '', 1, - "$prog: cannot open `+cl' for reading: No such file or directory\n"], + "$prog: cannot open '+cl' for reading: No such file or directory\n"], ['err-2', '-cl', '', '', 1, "$prog: l: invalid number of bytes\n"], ['err-3', '+2cz', '', '', 1, - "$prog: cannot open `+2cz' for reading: No such file or directory\n"], + "$prog: cannot open '+2cz' for reading: No such file or directory\n"], # This should get 'tail: invalid option -- 2' ['err-4', '-2cX', '', '', 1, |