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/rm/empty-name | |
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/rm/empty-name')
-rwxr-xr-x | tests/rm/empty-name | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rm/empty-name b/tests/rm/empty-name index 192a60b4b..bb8307a50 100755 --- a/tests/rm/empty-name +++ b/tests/rm/empty-name @@ -44,10 +44,10 @@ my @Tests = # test-name options input expected-output # ['empty-name-1', "''", {EXIT => 1}, - {ERR => "$prog: cannot remove `': No such file or directory\n"}], + {ERR => "$prog: cannot remove '': No such file or directory\n"}], ['empty-name-2', "a '' b", {EXIT => 1}, - {ERR => "$prog: cannot remove `': No such file or directory\n"}, + {ERR => "$prog: cannot remove '': No such file or directory\n"}, {PRE => sub { mk_file qw(a b) }}, {POST => sub {-f 'a' || -f 'b' and die "a or b remain\n" }}, ], |