summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-01-06 10:14:39 +0100
committerJim Meyering <meyering@redhat.com>2012-01-06 11:00:36 +0100
commite8fb9b01699ee235fd4d3c6d0d413d40006a5014 (patch)
tree2b03bfa6abef7d9afcdeeb664ad14a57038f2472 /tests
parent847446ac841857e532b208cad21957e706a7c989 (diff)
downloadcoreutils-e8fb9b01699ee235fd4d3c6d0d413d40006a5014.tar.xz
tests: adjust quoting in expected output to match new gnulib policy
* tests/misc/xstrtol: Use '...' to match new quoting in most places. However, leave `9x' to match the sole comparison against output from the quote function, which still uses `...'. * tests/misc/sort-merge: Likewise, though here I had to leave `...'-quoted output to match output from four tests. * tests/pr/pr-tests: Convert a single `...' to '...'. * gnulib: Update submodule to latest.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/misc/sort-merge4
-rwxr-xr-xtests/misc/xstrtol6
-rwxr-xr-xtests/pr/pr-tests2
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/misc/sort-merge b/tests/misc/sort-merge
index 618ab1dd8..3303d10af 100755
--- a/tests/misc/sort-merge
+++ b/tests/misc/sort-merge
@@ -50,10 +50,10 @@ my @Tests =
"$prog: minimum --batch-size argument is `2'\n"}, {EXIT=>2}],
['nmerge-neg', "-m --batch-size=-1", @inputs,
- {ERR=>"$prog: invalid --batch-size argument `-1'\n"}, {EXIT=>2}],
+ {ERR=>"$prog: invalid --batch-size argument '-1'\n"}, {EXIT=>2}],
['nmerge-nan', "-m --batch-size=a", @inputs,
- {ERR=>"$prog: invalid --batch-size argument `a'\n"}, {EXIT=>2}],
+ {ERR=>"$prog: invalid --batch-size argument 'a'\n"}, {EXIT=>2}],
['nmerge-big', "-m --batch-size=$bigint", @inputs,
{ERR_SUBST=>'s/(current rlimit is) \d+/$1/'},
diff --git a/tests/misc/xstrtol b/tests/misc/xstrtol
index 339bf8c6f..bdc7bff28 100755
--- a/tests/misc/xstrtol
+++ b/tests/misc/xstrtol
@@ -30,13 +30,13 @@ my @Tests =
# test-name, [option, option, ...] {OUT=>"expected-output"}
['inval-suffix', "--pages=${too_big}h", {EXIT => 1},
- {ERR=>"$prog: invalid suffix in --pages argument `${too_big}h'\n"}],
+ {ERR=>"$prog: invalid suffix in --pages argument '${too_big}h'\n"}],
['too-big', "--pages=$too_big", {EXIT => 1},
- {ERR=>"$prog: --pages argument `$too_big' too large\n"}],
+ {ERR=>"$prog: --pages argument '$too_big' too large\n"}],
['simply-inval', "--pages=x", {EXIT => 1},
- {ERR=>"$prog: invalid --pages argument `x'\n"}],
+ {ERR=>"$prog: invalid --pages argument 'x'\n"}],
['inv-pg-range', "--pages=9x", {EXIT => 1},
{ERR=>"$prog: invalid page range `9x'\n"}],
diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests
index 5058b4a17..0cfca13b2 100755
--- a/tests/pr/pr-tests
+++ b/tests/pr/pr-tests
@@ -392,7 +392,7 @@ my @tv = (
# Before coreutils-5.3.1, --pages=1:-1 would be treated like
# --pages=1:18446744073709551615.
['neg-page', '--pages=1:-1', '', '', 1,
- "$prog: invalid --pages argument `1:-1'\n"],
+ "$prog: invalid --pages argument '1:-1'\n"],
# Up to coreutils-6.10, this would cause pr to decrement its
# internal "input_position" below zero and sometimes segfault.