mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-04-20 18:56:39 +02:00
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'\'';'\
This commit is contained in:
@@ -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"],
|
||||
|
||||
|
||||
Reference in New Issue
Block a user