summaryrefslogtreecommitdiff
path: root/tests/mv
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/mv
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/mv')
-rwxr-xr-xtests/mv/hard-32
-rwxr-xr-xtests/mv/i-12
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/mv/hard-3 b/tests/mv/hard-3
index 9a7a2a376..1a1f82fff 100755
--- a/tests/mv/hard-3
+++ b/tests/mv/hard-3
@@ -1,5 +1,5 @@
#!/bin/sh
-# Ensure that using `cp --preserve=link' to copy hard-linked arguments
+# Ensure that using 'cp --preserve=link' to copy hard-linked arguments
# onto existing destinations works, even when one of the link operations fails.
# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
diff --git a/tests/mv/i-1 b/tests/mv/i-1
index 20b6ad7b9..5895137da 100755
--- a/tests/mv/i-1
+++ b/tests/mv/i-1
@@ -30,7 +30,7 @@ my @Tests =
# Make sure a 'n' reply to 'mv -i...' aborts the move operation.
[$test_a, '-i',
{IN => {src => "a\n"}}, {IN => {dst => "b\n"}}, '<', {IN => "n\n"},
- {ERR => "mv: overwrite `dst'? "},
+ {ERR => "mv: overwrite 'dst'? "},
{POST => sub { -r 'src' or die "test $test_a failed\n"}},
{EXIT => 0},
],