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/pr | |
| 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/pr')
| -rwxr-xr-x | tests/pr/pr-tests | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests index de1061225..2a333dc1e 100755 --- a/tests/pr/pr-tests +++ b/tests/pr/pr-tests @@ -334,7 +334,7 @@ my @tv = ( ['14g', '-2 -S -f', [\'t_notab'], [\'2-Sf-t_notab'], 0], # full lines, no truncation / separator = TAB : (Input: -S"<TAB>") ['14h', '-2 -S" " -J -f', [\'t_notab'], [\'2sf-t_notab'], 0], -# columns, truncated = 72 / separator `:' : +# columns, truncated = 72 / separator ':' : ['14i', '-2 -S: -f', [\'t_notab'], [\'2-S_f-t_notab'], 0], # full lines, no truncation / separator = `:' : ['14j', '-2 -S: -J -f', [\'t_notab'], [\'2s_f-t_notab'], 0], @@ -385,7 +385,7 @@ my @tv = ( ['col-long', '-W3 -t -1 --columns=2', "a\nb\nc\n", "a c\nb\n", 0], # Make sure these fail. ['col-0', '-0', '', '', 1, - "$prog: invalid number of columns: `0'\n"], + "$prog: invalid number of columns: '0'\n"], ['col-inval', '-'.'9'x100, '', '', 1, "$prog: invalid number of columns: `". ('9'x100) ."'\n"], |