From ae2b0d2ddca458eb282bb0458987e75e1875a659 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 7 Jan 2012 20:55:10 +0100 Subject: 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'\'';'\ --- tests/chgrp/basic | 2 +- tests/chgrp/deref | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/chgrp') diff --git a/tests/chgrp/basic b/tests/chgrp/basic index 0cf0bca84..9c384ba38 100755 --- a/tests/chgrp/basic +++ b/tests/chgrp/basic @@ -66,7 +66,7 @@ chown --from=:$g1 :$g2 f; test `stat --printf=%g f` = $g2 || fail=1 # This *should* change the group of f. # Though note that the diagnostic is misleading in that -# it says the 'group of `symlink'' has been changed. +# it says the 'group of 'symlink'' has been changed. chgrp $g1 symlink; test `stat --printf=%g f` = $g1 || fail=1 chown --from=:$g1 :$g2 f; test `stat --printf=%g f` = $g2 || fail=1 diff --git a/tests/chgrp/deref b/tests/chgrp/deref index cf1ddd869..dcdc4367a 100755 --- a/tests/chgrp/deref +++ b/tests/chgrp/deref @@ -52,7 +52,7 @@ set _ `ls -ln f`; g=$5; test "$g" = $g2 || fail=1 # This *should* change the group of f. # Though note that the diagnostic you'd get with -c is misleading in that -# it says the 'group of `symlink'' has been changed. +# it says the 'group of 'symlink'' has been changed. chgrp --dereference $g1 symlink set _ `ls -ln f`; g=$5; test "$g" = $g1 || fail=1 set _ `ls -ln symlink`; g=$5; test "$g" = $g2 || fail=1 -- cgit v1.2.3-54-g00ecf