From 36b9a1b6ac2730e78c14552fd55795fe10862a3d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 7 Jan 2012 18:30:14 +0100
Subject: 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.
---
 tests/misc/chcon       | 2 +-
 tests/misc/mktemp      | 2 +-
 tests/misc/stat-printf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/misc')

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"}],
-- 
cgit v1.2.3-70-g09d2