diff options
author | Jim Meyering <meyering@redhat.com> | 2012-01-07 18:30:14 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-01-09 21:50:08 +0100 |
commit | 36b9a1b6ac2730e78c14552fd55795fe10862a3d (patch) | |
tree | 193aeae1bfea1c96e1cd7226a51208d396bb4ec2 /tests | |
parent | ae2b0d2ddca458eb282bb0458987e75e1875a659 (diff) | |
download | coreutils-36b9a1b6ac2730e78c14552fd55795fe10862a3d.tar.xz |
maint: adjust quoting: emit '...', not `...' in diagnostics
* src/csplit.c (parse_repeat_count, extract_regexp): As above.
* src/date.c (main): Likewise.
* src/ls.c (decode_switches): Likewise.
* src/od.c (decode_one_format, main): Likewise.
* src/pathchk.c (no_leading_hyphen): Likewise.
* src/pr.c (main, getoptarg): Likewise.
* src/rm.c (diagnose_leading_hyphen): Likewise.
* src/sort.c (key_warnings, incompatible_options, main): Likewise.
* src/stat.c (print_esc_char): Print '\x', not `\x' in diagnostic.
* src/test.c (main): Likewise.
* src/touch.c (main): Likewise.
* src/tr.c (build_spec_list, validate, append_range): Likewise.
* tests/misc/mktemp: This is an unusual case, since the affected
string contains only the ` of an `...' string. So we change
the long ` to a lone '.
* tests/pr/pr-tests: Manual quote adapting fix-up.
* tests/ln/hard-to-sym: Likewise.
* tests/split/suffix-length: Likewise.
* tests/mv/part-fail: Likewise.
* tests/misc/chcon: Likewise.
* tests/misc/stat-printf: Likewise.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/ln/hard-to-sym | 6 | ||||
-rwxr-xr-x | tests/misc/chcon | 2 | ||||
-rwxr-xr-x | tests/misc/mktemp | 2 | ||||
-rwxr-xr-x | tests/misc/stat-printf | 2 | ||||
-rwxr-xr-x | tests/mv/part-fail | 2 | ||||
-rwxr-xr-x | tests/pr/pr-tests | 2 | ||||
-rwxr-xr-x | tests/split/suffix-length | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/tests/ln/hard-to-sym b/tests/ln/hard-to-sym index 3ea4570b1..044b10c0d 100755 --- a/tests/ln/hard-to-sym +++ b/tests/ln/hard-to-sym @@ -53,7 +53,7 @@ esac ln -s /no-such-dir || framework_failure_ ln -L no-such-dir hard-to-dangle 2>err && fail=1 case `cat err` in - *' accessing 'no-such-dir'\':*) ;; + *" accessing 'no-such-dir'":*) ;; *) fail=1 ;; esac ln -P no-such-dir hard-to-dangle || fail=1 @@ -64,12 +64,12 @@ mkdir d || framework_failure_ ln -s d link-to-dir || framework_failure_ ln -L link-to-dir hard-to-dir-link 2>err && fail=1 case `cat err` in - *': 'link-to-dir'\'': hard link not allowed for directory'*) ;; + *": 'link-to-dir': hard link not allowed for directory"*) ;; *) fail=1 ;; esac ln -P link-to-dir/ hard-to-dir-link 2>err && fail=1 case `cat err` in - *': 'link-to-dir/'\'': hard link not allowed for directory'*) ;; + *": 'link-to-dir/': hard link not allowed for directory"*) ;; *) fail=1 ;; esac ln -P link-to-dir hard-to-dir-link || fail=1 diff --git a/tests/misc/chcon b/tests/misc/chcon index caa483143..6b4458034 100755 --- a/tests/misc/chcon +++ b/tests/misc/chcon @@ -71,7 +71,7 @@ EOF compare exp out || fail=1 chcon --verbose -u$u1 f > out || fail=1 -echo 'changing security context of 'f'\' > exp +echo "changing security context of 'f'" > exp compare exp out || fail=1 Exit $fail diff --git a/tests/misc/mktemp b/tests/misc/mktemp index c6291fbb6..49dfde494 100755 --- a/tests/misc/mktemp +++ b/tests/misc/mktemp @@ -190,7 +190,7 @@ my @Tests = ['pipe-bad-tmpdir', {ENV => "TMPDIR=$bad_dir"}, {ERR_SUBST => "s,($bad_dir/)[^']+': .*,\$1...,"}, - {ERR => "$prog: failed to create file via template `$bad_dir/...\n"}, + {ERR => "$prog: failed to create file via template '$bad_dir/...\n"}, {EXIT => 1}], ['pipe-bad-tmpdir-u', '-u', {OUT => "$bad_dir/tmp.ZZZZZZZZZZ\n"}, {ENV => "TMPDIR=$bad_dir"}, diff --git a/tests/misc/stat-printf b/tests/misc/stat-printf index b576d250b..929b255e5 100755 --- a/tests/misc/stat-printf +++ b/tests/misc/stat-printf @@ -40,7 +40,7 @@ my @Tests = ['hex-1', q!--printf='\x34\xf' .!, {OUT=>"\x34\xf"}], ['hex-2', q!--printf='.\x18p\xfq' .!, {OUT=>".\x18p\x0fq"}], ['hex-3', q!--printf='\x' .!, {OUT=>'x'}, - {ERR=>"$prog: warning: unrecognized escape `\\x'\n"}], + {ERR=>"$prog: warning: unrecognized escape '\\x'\n"}], # With --format, there *is* a trailing newline. ['f-nl', "--format=%n .", {OUT=>".\n"}], diff --git a/tests/mv/part-fail b/tests/mv/part-fail index f5d2bb3ee..3a3e37f21 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -31,7 +31,7 @@ chmod u-w "$other_partition_tmpdir" || framework_failure_ mv -f k "$other_partition_tmpdir" 2> out && fail=1 printf \ -'mv: inter-device move failed: '%s'\'' to '%s'\'';'\ +"mv: inter-device move failed: '%s' to '%s';"\ ' unable to remove target: Permission denied\n' \ k "$other_partition_tmpdir/k" >exp diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests index 2a333dc1e..2e1a80ca1 100755 --- a/tests/pr/pr-tests +++ b/tests/pr/pr-tests @@ -387,7 +387,7 @@ my @tv = ( ['col-0', '-0', '', '', 1, "$prog: invalid number of columns: '0'\n"], ['col-inval', '-'.'9'x100, '', '', 1, - "$prog: invalid number of columns: `". ('9'x100) ."'\n"], + "$prog: invalid number of columns: '". ('9'x100) ."'\n"], # Before coreutils-5.3.1, --pages=1:-1 would be treated like # --pages=1:18446744073709551615. diff --git a/tests/split/suffix-length b/tests/split/suffix-length index 7779ef2f8..bc65e9f6d 100755 --- a/tests/split/suffix-length +++ b/tests/split/suffix-length @@ -31,7 +31,7 @@ done files="${files}xba" for f in $files; do - printf 'creating file `%s'\''\n' $f + printf "creating file '%s'"'\n' $f done > exp || framework_failure_ echo split: output file suffixes exhausted \ |