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/seq | |
| 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/seq')
| -rwxr-xr-x | tests/misc/seq | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/misc/seq b/tests/misc/seq index 05770b0da..3ea869f62 100755 --- a/tests/misc/seq +++ b/tests/misc/seq @@ -82,20 +82,20 @@ my @Tests = # In coreutils-[6.0..6.9], this would mistakenly succeed and print "%Lg". ['fmt-c', qw(-f %%g 1), {EXIT => 1}, - {ERR => "seq: format `%%g' has no % directive\n"}], + {ERR => "seq: format '%%g' has no % directive\n"}], # In coreutils-6.9..6.10, this would fail with an erroneous diagnostic: # "seq: memory exhausted". In coreutils-6.0..6.8, it would mistakenly # succeed and print a blank line. ['fmt-eos1', qw(-f % 1), {EXIT => 1}, - {ERR => "seq: format `%' ends in %\n"}], + {ERR => "seq: format '%' ends in %\n"}], ['fmt-eos2', qw(-f %g% 1), {EXIT => 1}, - {ERR => "seq: format `%g%' has too many % directives\n"}], + {ERR => "seq: format '%g%' has too many % directives\n"}], ['fmt-d', qw(-f "" 1), {EXIT => 1}, - {ERR => "seq: format `' has no % directive\n"}], + {ERR => "seq: format '' has no % directive\n"}], ['fmt-e', qw(-f %g%g 1), {EXIT => 1}, - {ERR => "seq: format `%g%g' has too many % directives\n"}], + {ERR => "seq: format '%g%g' has too many % directives\n"}], # With coreutils-6.12 and earlier, with a UTF8 numeric locale that uses # something other than "." as the decimal point, this use of seq would |