summaryrefslogtreecommitdiff
path: root/tests/misc/mktemp
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-01-07 20:55:10 +0100
committerJim Meyering <meyering@redhat.com>2012-01-09 21:50:08 +0100
commitae2b0d2ddca458eb282bb0458987e75e1875a659 (patch)
treede928bfafb577a20963be45b4b6d97488c0b5e24 /tests/misc/mktemp
parentdd0e4c5621ca2fa9255aef4eee0e7cf41cd335d2 (diff)
downloadcoreutils-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/mktemp')
-rwxr-xr-xtests/misc/mktemp18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/misc/mktemp b/tests/misc/mktemp
index 40bbe5100..c6291fbb6 100755
--- a/tests/misc/mktemp
+++ b/tests/misc/mktemp
@@ -61,7 +61,7 @@ my @Tests =
['too-many-q', '-q a b', {EXIT => 1} ],
['too-few-x', 'foo.XX', {EXIT => 1},
- {ERR=>"$prog: too few X's in template `foo.XX'\n"}],
+ {ERR=>"$prog: too few X's in template 'foo.XX'\n"}],
['too-few-xq', '-q foo.XX', {EXIT => 1} ],
['1f', 'bar.XXXX', {OUT => "bar.ZZZZ\n"},
@@ -103,11 +103,11 @@ my @Tests =
# Test bad templates
['invalid-tl', '-t a/bXXXX',
- {ERR=>"$prog: invalid template, `a/bXXXX', "
+ {ERR=>"$prog: invalid template, 'a/bXXXX', "
. "contains directory separator\n"}, {EXIT => 1} ],
['invalid-t2', '--tmpdir=a /bXXXX',
- {ERR=>"$prog: invalid template, `/bXXXX'; "
+ {ERR=>"$prog: invalid template, '/bXXXX'; "
. "with --tmpdir, it may not be absolute\n"}, {EXIT => 1} ],
# Suffix after X.
@@ -144,17 +144,17 @@ my @Tests =
check_tmp $f, 'F'; }}],
['suffix5f', '--suffix /b aXXXX', {EXIT=>1},
- {ERR=>"$prog: invalid suffix `/b', contains directory separator\n"}],
+ {ERR=>"$prog: invalid suffix '/b', contains directory separator\n"}],
['suffix6f', 'aXXXX/b', {EXIT=>1},
- {ERR=>"$prog: invalid suffix `/b', contains directory separator\n"}],
+ {ERR=>"$prog: invalid suffix '/b', contains directory separator\n"}],
['suffix6f-q', '-q aXXXX/b', {EXIT=>1}],
['suffix7f', '--suffix= aXXXXb', {EXIT=>1},
- {ERR=>"$prog: with --suffix, template `aXXXXb' must end in X\n"}],
+ {ERR=>"$prog: with --suffix, template 'aXXXXb' must end in X\n"}],
['suffix7f-q', '-q --suffix= aXXXXb', {EXIT=>1}],
['suffix7d', '-d --suffix=aXXXXb ""', {EXIT=>1},
- {ERR=>"$prog: with --suffix, template `' must end in X\n"}],
+ {ERR=>"$prog: with --suffix, template '' must end in X\n"}],
['suffix8f', 'aXXXX --suffix=b', {OUT=>"aZZZZb\n"},
{OUT_SUBST=>'s,^a....,aZZZZ,'},
@@ -167,9 +167,9 @@ my @Tests =
. "Try '$prog --help' for more information.\n"}],
['suffix10f', 'aXXb', {EXIT => 1},
- {ERR=>"$prog: too few X's in template `aXXb'\n"}],
+ {ERR=>"$prog: too few X's in template 'aXXb'\n"}],
['suffix10d', '-d --suffix=X aXX', {EXIT => 1},
- {ERR=>"$prog: too few X's in template `aXXX'\n"}],
+ {ERR=>"$prog: too few X's in template 'aXXX'\n"}],
['suffix11f', '--suffix=.txt', {OUT=>"./tmp.ZZZZZZZZZZ.txt\n"},
{ENV=>"TMPDIR=."},