31 files changed, 264 insertions, 123 deletions
diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm
index 70974a8ad..63312ad88 100644
--- a/tests/Coreutils.pm
+++ b/tests/Coreutils.pm
@@ -67,7 +67,7 @@ defined $ENV{DJDIR}
 # {ERR => ...}
 #           Same as for OUT, but compare with stderr, not stdout.
 # {OUT_SUBST => 's/variable_output/expected_output/'}
-#   Transform actual standard output before comparing it against expected output.
+#   Transform actual standard output before comparing it against expected.
 #   This is useful e.g. for programs like du that produce output that
 #   varies a lot from system.  E.g., an empty file may consume zero file
 #   blocks, or more, depending on the OS and on the file system type.
@@ -507,7 +507,8 @@ sub run_tests ($$$$$)
             {
               my $out_file = $actual{$eo};
               open IN, $out_file
-                or (warn "$program_name: cannot open $out_file for reading: $!\n"),
+                or (warn
+                    "$program_name: cannot open $out_file for reading: $!\n"),
                   $fail = 1, next;
               $actual_data{$eo} = <IN>;
               close IN
diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race
index f048eb160..d5774404e 100755
--- a/tests/cp/existing-perm-race
+++ b/tests/cp/existing-perm-race
@@ -71,8 +71,8 @@ case $mode in
   # a $g2 process can maintain an open file descriptor to the
   # destination, but it's safer anyway.
   -rw-r-----*)
-    # If the file has group $g1 and is group-readable, that is definitely
-    # bogus, as neither the source nor the destination was readable to group $g1.
+    # If the file has group $g1 and is group-readable, that is definitely bogus,
+    # as neither the source nor the destination was readable to group $g1.
     test "$group" = "$g1" && fail=1;;
 
   *) fail=1;;
diff --git a/tests/cp/perm b/tests/cp/perm
index e5fdb098d..663ad4dfa 100755
--- a/tests/cp/perm
+++ b/tests/cp/perm
@@ -55,9 +55,13 @@ for u in 31 37 2; do
                 ;;
               cp:*:no)
                 test $u = 37 &&
-                  expected_perms=`echo $expected_perms|sed 's/.....$/-----/'`
+                  expected_perms=`
+                    echo $expected_perms | sed 's/.....$/-----/'
+                  `
                 test $u = 31 &&
-                  expected_perms=`echo $expected_perms|sed 's/..\(..\).$/--\1-/'`
+                  expected_perms=`
+                    echo $expected_perms | sed 's/..\(..\).$/--\1-/'
+                  `
                 ;;
             esac
             test _$actual_perms = _$expected_perms || exit 1
diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid
index a25cbb478..b0497841d 100755
--- a/tests/cp/preserve-gid
+++ b/tests/cp/preserve-gid
@@ -60,9 +60,24 @@ t1() {
       "$nameless_uid" "$@"
 }
 
-nameless_uid=`$PERL -le 'foreach my $i (1000..16*1024-1) { getpwuid $i or (print $i), exit }'`
-nameless_gid1=`$PERL -le 'foreach my $i (1000..16*1024) { getgrgid $i or (print $i), exit }'`
-nameless_gid2=`$PERL -le 'foreach my $i ('"$nameless_gid1"'+1..16*1024) { getgrgid $i or (print $i), exit }'`
+nameless_uid=`$PERL -le '
+  foreach my $i (1000..16*1024-1)
+    {
+      getpwuid $i or (print $i), exit
+    }
+'`
+nameless_gid1=`$PERL -le '
+  foreach my $i (1000..16*1024)
+    {
+      getgrgid $i or (print $i), exit
+    }
+'`
+nameless_gid2=`$PERL -le '
+  foreach my $i ('"$nameless_gid1"'+1..16*1024)
+    {
+      getgrgid $i or (print $i), exit
+    }
+'`
 
 if test -z "$nameless_uid" \
     || test -z "$nameless_gid1" \
diff --git a/tests/du/2g b/tests/du/2g
index da3cc6a48..1b50e34d6 100755
--- a/tests/du/2g
+++ b/tests/du/2g
@@ -40,7 +40,8 @@ esac
 min_kb=3000000
 test $min_kb -lt $free_kb ||
 {
-  skip_test_ "too little free space on current partition: $free_kb (need $min_kb KB)"
+  skip_test_ \
+    "too little free space on current partition: $free_kb (need $min_kb KB)"
 }
 
 big=big
diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable
index 1da08bfaa..d27279013 100755
--- a/tests/du/long-from-unreadable
+++ b/tests/du/long-from-unreadable
@@ -47,7 +47,9 @@ dir=`printf '%200s\n' ' '|tr ' ' x`
 # cd $tmp || framework_failure
 
 # Sheesh.  Bash 3.1.5 can't create this hierarchy.  I get
-# cd: error retrieving current directory: getcwd: cannot access parent directories:
+#   cd: error retrieving current directory: getcwd:
+#     cannot access parent directories:
+# (all on one line).
 
 cwd=`pwd`
 # Use perl instead:
diff --git a/tests/init.sh b/tests/init.sh
index 4d89a1af6..22ba23656 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -111,7 +111,7 @@ fi
 
 # Eval this code in a subshell to determine a shell's suitability.
 # 10 - passes all tests; ok to use
-#  9 - ok, but enabling "set -x" corrupts application stderr; prefer higher score
+#  9 - ok, but enabling "set -x" corrupts app stderr; prefer higher score
 #  ? - not ok
 gl_shell_test_script_='
 test $(echo y) = y || exit 1
@@ -414,7 +414,8 @@ mktempd_()
 
   case $template_ in
   *XXXX) ;;
-  *) fail_ "invalid template: $template_ (must have a suffix of at least 4 X's)";;
+  *) fail_ \
+       "invalid template: $template_ (must have a suffix of at least 4 X's)";;
   esac
 
   # First, try to use mktemp.
diff --git a/tests/install/basic-1 b/tests/install/basic-1
index 3c45c2abb..6e37c2c48 100755
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -74,7 +74,10 @@ test -d newdir3 || fail=1
 # hence cannot do anything meaningful with the following relative-named dirs.
 iwd=`pwd`
 mkdir sub || fail=1
-(cd sub && chmod 0 . && ginstall -d "$iwd/xx/yy" rel/sub1 rel/sub2 2> /dev/null) && fail=1
+(cd sub &&
+ chmod 0 . &&
+ ginstall -d "$iwd/xx/yy" rel/sub1 rel/sub2 2> /dev/null
+) && fail=1
 chmod 755 sub
 
 # Ensure that the first argument-dir has been created.
diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid
index e54c7ae55..73023a92c 100755
--- a/tests/ls/nameless-uid
+++ b/tests/ls/nameless-uid
@@ -24,7 +24,9 @@ print_ver_ ls
 
 require_root_
 
-nameless_uid=`$PERL -e 'foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit }'`
+nameless_uid=`$PERL -e '
+  foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit }
+'`
 
 if test x$nameless_uid = x; then
   skip_test_ "couldn't find a nameless UID"
diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode
index 8c17eb455..fc837d0d7 100755
--- a/tests/ls/readdir-mountpoint-inode
+++ b/tests/ls/readdir-mountpoint-inode
@@ -22,7 +22,8 @@ print_ver_ ls
 # We use --local here so as to not activate
 # potentially very many remote mounts.
 mount_points=$(df --local -P 2>&1 | sed -n 's,.*[0-9]% \(/.\),\1,p')
-test -z "$mount_points" && skip_test_ "this test requires a non-root mount point"
+test -z "$mount_points" &&
+   skip_test_ "this test requires a non-root mount point"
 
 # Given e.g., /dev/shm, produce the list of GNU ls options that
 # let us list just that entry using readdir data from its parent:
diff --git a/tests/misc/chroot-credentials b/tests/misc/chroot-credentials
index cfa903dd5..2bce5cfd9 100755
--- a/tests/misc/chroot-credentials
+++ b/tests/misc/chroot-credentials
@@ -28,12 +28,17 @@ test $(chroot / whoami) = root || fail=1
 test "$(groups)" = "$(chroot / groups)" || fail=1
 
 # Verify that credentials are changed correctly.
-test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami)" != root \
-    || fail=1
+whoami_after_chroot=$(
+  chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami
+)
+test "$whoami_after_chroot" != root || fail=1
 
 # Verify that there are no additional groups.
-test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP --groups=$NON_ROOT_GROUP / id -G)"\
-    = $NON_ROOT_GROUP || fail=1
+id_G_after_chroot=$(
+  chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP \
+    --groups=$NON_ROOT_GROUP / id -G
+)
+test "$id_G_after_chroot" = $NON_ROOT_GROUP || fail=1
 
 # Verify that when specifying only the user name we get the current
 # primary group ID.
diff --git a/tests/misc/cut b/tests/misc/cut
index e8f003ff2..f91932c02 100755
--- a/tests/misc/cut
+++ b/tests/misc/cut
@@ -87,7 +87,8 @@ my @Tests =
     . "\tonly when operating on fields\n$try"}],
   # You must specify bytes or fields (or chars)
   ['z', '', {IN=>":\n"}, {OUT=>""}, {EXIT=>1},
-   {ERR=>"$prog: you must specify a list of bytes, characters, or fields\n$try"}],
+   {ERR=>"$prog: you must specify a list of bytes, characters, or fields\n$try"}
+  ],
   # Empty field list
   ['empty-fl', qw(-f ''), {IN=>":\n"}, {OUT=>""}, {EXIT=>1}, {ERR=>$from_1}],
   # Missing field list
@@ -124,7 +125,7 @@ my @Tests =
   ['out-delim3a', '-c1-3,2-4,6-', '--output-d=:', {IN=>"abcdefg\n"},
    {OUT=>"abcd:fg\n"}],
   # Ensure that the following two commands produce the same output.
-  # Before an off-by-one fix, the output from the former would not contain a `:'.
+  # Before an off-by-1 fix, the output from the former would not contain a `:'.
   ['out-delim4', '-c4-,2-3', '--output-d=:',
    {IN=>"abcdefg\n"}, {OUT=>"bc:defg\n"}],
   ['out-delim5', '-c2-3,4-', '--output-d=:',
@@ -137,14 +138,16 @@ my @Tests =
   ['od-overlap2', '-b1-2,2-', '--output-d=:', {IN=>"abc\n"}, {OUT=>"abc\n"}],
   ['od-overlap3', '-b1-3,2-', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"abcd\n"}],
   ['od-overlap4', '-b1-3,2-3', '--output-d=:', {IN=>"abcd\n"}, {OUT=>"abc\n"}],
-  ['od-overlap5', '-b1-3,1-4', '--output-d=:', {IN=>"abcde\n"}, {OUT=>"abcd\n"}],
+  ['od-overlap5', '-b1-3,1-4', '--output-d=:',
+   {IN=>"abcde\n"}, {OUT=>"abcd\n"}],
 
   # None of the following invalid ranges provoked an error up to coreutils-6.9.
   ['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
    {ERR=>"$prog: invalid decreasing range\n$try"}],
   ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
   ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
-  ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
+  ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1},
+   {ERR=>$no_endpoint}],
   ['inval5', '-f', '1-,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
   ['inval6', '-f', '-1,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
  );
diff --git a/tests/misc/date b/tests/misc/date
index 1b64558b4..38c4f3726 100755
--- a/tests/misc/date
+++ b/tests/misc/date
@@ -230,7 +230,8 @@ my @Tests =
      ['tz-5wf', '+%:8z', {OUT=>"%:8z"}, {ENV=>'TZ=XXX0:01'}],
 
      ['ns-relative',
-      '--iso=ns', "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'",
+      '--iso=ns',
+      "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'",
       {OUT=>"2000-06-15T09:43:58,111111021+0000"}],
      ['ns-relativer', '--rfc-3339=ns',
       "-d'1970-01-01 00:00:00.1234567 UTC +961062237.987654321 sec'",
diff --git a/tests/misc/join b/tests/misc/join
index a319b943c..ab43b5d56 100755
--- a/tests/misc/join
+++ b/tests/misc/join
@@ -216,7 +216,8 @@ my @tv = (
 # '--header' always outputs headers from the first file
 # even if the headers from the second file don't match
 ['header-5', '--header',
- [ "ID1 Name\n1 A\n2 B\n", "ID2 Color\n1 red\n"], "ID1 Name Color\n1 A red\n", 0],
+ [ "ID1 Name\n1 A\n2 B\n", "ID2 Color\n1 red\n"],
+   "ID1 Name Color\n1 A red\n", 0],
 
 );
 
diff --git a/tests/misc/md5sum b/tests/misc/md5sum
index 819a81925..fc3bbb8c6 100755
--- a/tests/misc/md5sum
+++ b/tests/misc/md5sum
@@ -62,8 +62,8 @@ my @Tests =
                                       . "invalid\n" }},
                                 {AUX=> {f=> 'foo'}},
                                 {OUT=>"f: FAILED\nf: FAILED\n"},
-                  {ERR=>"md5sum: WARNING: 1 line is improperly formatted\n"
-                      . "md5sum: WARNING: 2 computed checksums did NOT match\n"},
+                {ERR=>"md5sum: WARNING: 1 line is improperly formatted\n"
+                    . "md5sum: WARNING: 2 computed checksums did NOT match\n"},
                                 {EXIT=> 1}],
      # Similar to the above, but use --warn to evoke one more diagnostic.
      ['check-multifail-warn', '--check', '--warn',
diff --git a/tests/misc/sha1sum b/tests/misc/sha1sum
index ecd779620..15badc085 100755
--- a/tests/misc/sha1sum
+++ b/tests/misc/sha1sum
@@ -60,7 +60,8 @@ my @Tests =
      ['check-bsd3', '--check', '--status',
                         {IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}},
                         {AUX=> {f=> 'bar'}}, {EXIT=> 1}],
-     ['check-openssl', '--check', {IN=> {'f.md5' => "MD5(f)= $sha_degenerate\n"}},
+     ['check-openssl', '--check',
+                        {IN=> {'f.md5' => "MD5(f)= $sha_degenerate\n"}},
                         {AUX=> {f=> ''}},
                         {ERR=>"sha1sum: f.md5: no properly formatted "
                           . "SHA1 checksum lines found\n"},
diff --git a/tests/misc/sha224sum b/tests/misc/sha224sum
index a46c2a1fa..634150dd1 100755
--- a/tests/misc/sha224sum
+++ b/tests/misc/sha224sum
@@ -26,12 +26,12 @@ use strict;
 my @Tests =
     (
      ['s3', {IN=> {f=> 'abc'}},
-                        {OUT=>"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7  f\n"}],
+      {OUT=>"23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7  f\n"}],
      ['s4',
       {IN=> {f=> 'abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq'}},
-                        {OUT=>"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525  f\n"}],
+      {OUT=>"75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525  f\n"}],
      ['s8', {IN=> {f=> 'a' x 1000000}},
-                        {OUT=>"20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67  f\n"}],
+      {OUT=>"20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67  f\n"}],
     );
 
 # Insert the `--text' argument for each test.
diff --git a/tests/misc/sort b/tests/misc/sort
index 5bc526a27..e01e29bbe 100755
--- a/tests/misc/sort
+++ b/tests/misc/sort
@@ -55,8 +55,11 @@ my @Tests =
 ["n11b", '-s -n -k1,1', {IN=>".010\n.01a\n"}, {OUT=>".010\n.01a\n"}],
 
 # human readable suffixes
-["h1", '-h', {IN=>"1Y\n1Z\n1E\n1P\n1T\n1G\n1M\n1K\n02\n1\nY\n-1k\n-1M\n-1G\n-1T\n-1P\n-1E\n-1Z\n-1Y\n"},
- {OUT=>"-1Y\n-1Z\n-1E\n-1P\n-1T\n-1G\n-1M\n-1k\nY\n1\n02\n1K\n1M\n1G\n1T\n1P\n1E\n1Z\n1Y\n"}],
+["h1", '-h',
+ {IN=>"1Y\n1Z\n1E\n1P\n1T\n1G\n1M\n1K\n02\n1\nY\n-1k\n-1M\n-1G\n-1T\n"
+      . "-1P\n-1E\n-1Z\n-1Y\n"},
+ {OUT=>"-1Y\n-1Z\n-1E\n-1P\n-1T\n-1G\n-1M\n-1k\nY\n1\n02\n1K\n1M\n1G\n1T\n"
+      . "1P\n1E\n1Z\n1Y\n"}],
 ["h2", '-h', {IN=>"1M\n-2G\n-3K"}, {OUT=>"-2G\n-3K\n1M\n"}],
 # check that it works with powers of 1024
 ["h3", '-k 2,2h -k 1,1', {IN=>"a 1G\nb 1023M\n"}, {OUT=>"b 1023M\na 1G\n"}],
@@ -275,8 +278,14 @@ my @Tests =
 # of memcmp in the Next C library.  With optimization, gcc uses its
 # (working) builtin version.  Test case form William Lewis.
 ["20a", '',
- {IN=>"_________U__free\n_________U__malloc\n_________U__abort\n_________U__memcpy\n_________U__memset\n_________U_dyld_stub_binding_helper\n_________U__malloc\n_________U___iob\n_________U__abort\n_________U__fprintf\n"},
- {OUT=>"_________U___iob\n_________U__abort\n_________U__abort\n_________U__fprintf\n_________U__free\n_________U__malloc\n_________U__malloc\n_________U__memcpy\n_________U__memset\n_________U_dyld_stub_binding_helper\n"}],
+ {IN=>"_________U__free\n_________U__malloc\n_________U__abort\n"
+      . "_________U__memcpy\n_________U__memset\n"
+      . "_________U_dyld_stub_binding_helper\n_________U__malloc\n"
+      . "_________U___iob\n_________U__abort\n_________U__fprintf\n"},
+ {OUT=>"_________U___iob\n_________U__abort\n_________U__abort\n"
+       . "_________U__fprintf\n_________U__free\n_________U__malloc\n"
+       . "_________U__malloc\n_________U__memcpy\n_________U__memset\n"
+       . "_________U_dyld_stub_binding_helper\n"}],
 
 # Demonstrate that folding changes the ordering of e.g. A, a, and _
 # because while they normally (in the C locale) collate like A, _, a,
diff --git a/tests/misc/sort-continue b/tests/misc/sort-continue
index 95f2c488e..f82255d6f 100755
--- a/tests/misc/sort-continue
+++ b/tests/misc/sort-continue
@@ -33,7 +33,8 @@ done
  exec 0</dev/null 3<&- 4<&- 5<&-
  sort -n -m __test.* > out
 ) &&
-compare in out || { fail=1; echo 'file descriptor exhaustion not handled' 1>&2; }
+compare in out ||
+  { fail=1; echo 'file descriptor exhaustion not handled' 1>&2; }
 
 echo 32 | tee -a in > in1
 (
diff --git a/tests/misc/sort-files0-from b/tests/misc/sort-files0-from
index e2eb5c47f..6082e8a02 100755
--- a/tests/misc/sort-files0-from
+++ b/tests/misc/sort-files0-from
@@ -80,7 +80,7 @@ my @Tests =
    ['2a', '--files0-from=-', '<',
     {IN=>{f=>"g\0g\0"}}, {AUX=>{g=>'a'}}, {OUT=>"a\na\n"} ],
 
-   # Ensure that $prog performs no processing when there is a zero-length filename
+   # Ensure that $prog does nothing when there is a zero-length filename.
    # Note that the behavior here differs from `wc' in that the
    # first zero-length file name is treated as fatal, so there
    # should be no output on STDOUT.
diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand
index 8fa3bc366..0034c452a 100755
--- a/tests/misc/sort-rand
+++ b/tests/misc/sort-rand
@@ -40,11 +40,13 @@ if (locale --version) > /dev/null 2>&1; then
   LC_ALL=$locale sort --random-sort in > out2 || fail=1
 
   # Fail if the output "randomly" is the same twice in a row.
-  compare out1 out2 > /dev/null && { fail=1; echo "not random with LC_ALL=$locale" 1>&2; }
+  compare out1 out2 > /dev/null &&
+    { fail=1; echo "not random with LC_ALL=$locale" 1>&2; }
 
   # Fail if the sorted output is not the same as the input.
   sort -n out > out1
-  compare in out1 || { fail=1; echo "not a permutation with LC_ALL=$locale" 1>&2; }
+  compare in out1 ||
+    { fail=1; echo "not a permutation with LC_ALL=$locale" 1>&2; }
 fi
 
 Exit $fail
diff --git a/tests/misc/stdbuf b/tests/misc/stdbuf
index 59c780370..2b7bdb833 100755
--- a/tests/misc/stdbuf
+++ b/tests/misc/stdbuf
@@ -22,7 +22,8 @@ print_ver_ stdbuf mv
 getlimits_
 require_built_ stdbuf
 
-# stdbuf fails when the absolute top build dir name contains e.g., space, TAB, NL
+# stdbuf fails when the absolute top build dir name contains e.g.,
+# space, TAB, NL
 lf='
 '
 case $abs_top_builddir in
diff --git a/tests/misc/tr b/tests/misc/tr
index 00cd8e62c..8d7d755b7 100755
--- a/tests/misc/tr
+++ b/tests/misc/tr
@@ -54,7 +54,8 @@ my @Tests =
   ['i', qw(-d '[:xdigit:]'), {IN=>'w0x1y2z3456789acbdefABCDEFz'},
    {OUT=>'wxyzz'}],
   ['j', qw(-d '[:digit:]'), {IN=>'0123456789'}, {OUT=>''}],
-  ['k', qw(-d '[:digit:]'), {IN=>'a0b1c2d3e4f5g6h7i8j9k'}, {OUT=>'abcdefghijk'}],
+  ['k', qw(-d '[:digit:]'),
+   {IN=>'a0b1c2d3e4f5g6h7i8j9k'}, {OUT=>'abcdefghijk'}],
   ['l', qw(-d '[:lower:]'), {IN=>'abcdefghijklmnopqrstuvwxyz'}, {OUT=>''}],
   ['m', qw(-d '[:upper:]'), {IN=>'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}, {OUT=>''}],
   ['n', qw(-d '[:lower:][:upper:]'),
@@ -83,11 +84,13 @@ my @Tests =
   ['u', qw(-ds b a), {IN=>'aabbaa'}, {OUT=>'a'}],
   ['v', qw(-ds '[:xdigit:]' Z), {IN=>'ZZ0123456789acbdefABCDEFZZ'}, {OUT=>'Z'}],
 
-  # Try some data with 8th bit set in case something is mistakenly sign-extended.
+  # Try some data with 8th bit set in case something is mistakenly
+  # sign-extended.
   ['w', qw(-ds '\350' '\345'),
    {IN=>"\300\301\377\345\345\350\345"},
    {OUT=>"\300\301\377\345"}],
-  ['x', qw(-s abcdefghijklmn '[:*016]'), {IN=>'abcdefghijklmnop'}, {OUT=>':op'}],
+  ['x', qw(-s abcdefghijklmn '[:*016]'),
+   {IN=>'abcdefghijklmnop'}, {OUT=>':op'}],
   ['y', qw(-d a-z), {IN=>'abc $code'}, {OUT=>' $'}],
   ['z', qw(-ds a-z '$.'), {IN=>'a.b.c $$$$code\\'}, {OUT=>'. $\\'}],
 
diff --git a/tests/misc/uniq b/tests/misc/uniq
index 4d1f8a4ff..5e83ad94f 100755
--- a/tests/misc/uniq
+++ b/tests/misc/uniq
@@ -180,10 +180,13 @@ my @Tests =
   "$prog: printing all duplicated lines and repeat counts is meaningless\n$try"}
   ],
  ['113', '--all-repeated=separate', {IN=>"a\na\n"}, {OUT=>"a\na\n"}],
- ['114', '--all-repeated=separate', {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"a\na\n\nc\nc\n"}],
- ['115', '--all-repeated=separate', {IN=>"a\na\nb\nb\nc\n"}, {OUT=>"a\na\n\nb\nb\n"}],
+ ['114', '--all-repeated=separate',
+  {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"a\na\n\nc\nc\n"}],
+ ['115', '--all-repeated=separate',
+  {IN=>"a\na\nb\nb\nc\n"}, {OUT=>"a\na\n\nb\nb\n"}],
  ['116', '--all-repeated=prepend', {IN=>"a\na\n"}, {OUT=>"\na\na\n"}],
- ['117', '--all-repeated=prepend', {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"\na\na\n\nc\nc\n"}],
+ ['117', '--all-repeated=prepend',
+  {IN=>"a\na\nb\nc\nc\n"}, {OUT=>"\na\na\n\nc\nc\n"}],
  ['118', '--all-repeated=prepend', {IN=>"a\nb\n"}, {OUT=>""}],
  ['119', '--all-repeated=badoption', {IN=>"a\n"}, {OUT=>""}, {EXIT=>1},
   {ERR=>"$prog: invalid argument \`badoption' for \`--all-repeated'\n"
diff --git a/tests/mv/atomic b/tests/mv/atomic
index c75e62bb4..c62491fda 100755
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -21,11 +21,13 @@ print_ver_ mv
 require_strace_ unlink
 
 # Before the fix, mv would unnecessarily unlink the destination symlink:
-#   $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2; strace -qe unlink /bin/mv -T s1 s2
+#   $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2
+#   $ strace -qe unlink /bin/mv -T s1 s2
 #   unlink("s2") = 0
 #
 # With the fix, it doesn't call unlink:
-#   $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2; strace -qe unlink ./mv -T s1 s2
+#   $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2
+#   $ strace -qe unlink ./mv -T s1 s2
 #   $
 
 ln -s t1 s1 || framework_failure
diff --git a/tests/mv/part-fail b/tests/mv/part-fail
index 2d80f599d..a506b92ad 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -30,9 +30,10 @@ chmod u-w "$other_partition_tmpdir" || framework_failure
 
 
 mv -f k "$other_partition_tmpdir" 2> out && fail=1
-cat <<EOF > exp
-mv: inter-device move failed: \`k' to \`$other_partition_tmpdir/k'; unable to remove target: Permission denied
-EOF
+printf \
+'mv: inter-device move failed: `%s'\'' to `%s'\'';'\
+' unable to remove target: Permission denied\n' \
+  k "$other_partition_tmpdir/k" >exp
 
 # On some (less-compliant) systems, we get EPERM in this case.
 # Accept either diagnostic.
diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index 425718aff..0d40355cb 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -92,9 +92,10 @@ for copy in cp mv; do
           # remove any site-dependent part of other-partition file name,
           # and put brackets around the output.
           test -s .err && {
-            echo '[' | tr -d '\n'
-            sed 's/^[^:][^:]*\(..\):/\1:/;s,'"$other_partition_tmpdir/,," .err
-            echo ']' | tr -d '\n'
+            echo ' [' | tr -d '\n'
+            sed 's/^[^:][^:]*\(..\):/\1:/;s,'"$other_partition_tmpdir/,," .err |
+              tr -d '\n'
+            echo ']'
             }
           # Strip off all but the file names.
           # Remove any site-dependent part of each file name.
@@ -110,16 +111,16 @@ for copy in cp mv; do
                   -e "s,$other_partition_tmpdir/,," \
                   -e "s,$pwd_tmp/,," \
                   -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`
-          echo "($ls) ($ls2)"
+          echo " ("$ls") ("$ls2")"
 
           # If the command failed, then it must not have changed the files.
           if test $copy_status != 0; then
             for f in $actual_args; do
               test -f $f ||
-                { echo "$copy FAILED but removed $f"; continue; }
+                { echo " $copy FAILED but removed $f"; continue; }
               case "`cat $f`" in
                 "$contents") ;;
-                *) echo "$copy FAILED but modified $f";;
+                *) echo " $copy FAILED but modified $f";;
               esac
             done
           fi
@@ -134,15 +135,14 @@ for copy in cp mv; do
                 fi
                 case "`cat $f`" in
                   "$contents") ;;
-                  *) echo $copy FAILED;;
+                  *) echo " $copy FAILED";;
                 esac
               else
-                echo symlink-loop
+                echo " symlink-loop"
               fi
             done
           fi
-        ) | tr '\n' ' '
-        echo
+        )
       ) | sed 's/  *$//'
       cd ..
     done
@@ -154,49 +154,107 @@ test $fail = 1 &&
   { (exit 1); exit; }
 
 cat <<\EOF > $expected
-1 cp loc_reg rem_sl [cp: `loc_reg' and `rem_sl' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-0 cp --rem loc_reg rem_sl (loc_reg) (rem_sl)
-0 cp --rem -d loc_reg rem_sl (loc_reg) (rem_sl)
-0 cp --rem -b loc_reg rem_sl (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg)
-0 cp -b loc_reg rem_sl (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg)
-0 cp -bd loc_reg rem_sl (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg)
-1 cp -d loc_reg rem_sl [cp: `loc_reg' and `rem_sl' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-
-1 cp rem_sl loc_reg [cp: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-1 cp --rem rem_sl loc_reg [cp: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-1 cp --rem -d rem_sl loc_reg [cp: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-1 cp --rem -b rem_sl loc_reg [cp: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-1 cp -b rem_sl loc_reg [cp: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-0 cp -bd rem_sl loc_reg (loc_reg -> dir/loc_reg loc_reg~) (rem_sl -> dir/loc_reg) symlink-loop symlink-loop
-1 cp -d rem_sl loc_reg [cp: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-
-1 cp loc_sl rem_reg [cp: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-1 cp --rem loc_sl rem_reg [cp: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-1 cp --rem -d loc_sl rem_reg [cp: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-1 cp --rem -b loc_sl rem_reg [cp: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-1 cp -b loc_sl rem_reg [cp: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-0 cp -bd loc_sl rem_reg (loc_sl -> rem_reg) (rem_reg -> rem_reg rem_reg~) symlink-loop symlink-loop
-1 cp -d loc_sl rem_reg [cp: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-
-1 cp rem_reg loc_sl [cp: `rem_reg' and `loc_sl' are the same file ](loc_sl -> rem_reg) (rem_reg)
-0 cp --rem rem_reg loc_sl (loc_sl) (rem_reg)
-0 cp --rem -d rem_reg loc_sl (loc_sl) (rem_reg)
-0 cp --rem -b rem_reg loc_sl (loc_sl loc_sl~ -> rem_reg) (rem_reg)
-0 cp -b rem_reg loc_sl (loc_sl loc_sl~ -> rem_reg) (rem_reg)
-0 cp -bd rem_reg loc_sl (loc_sl loc_sl~ -> rem_reg) (rem_reg)
-1 cp -d rem_reg loc_sl [cp: `rem_reg' and `loc_sl' are the same file ](loc_sl -> rem_reg) (rem_reg)
-
-0 mv loc_reg rem_sl () (rem_sl)
-0 mv -b loc_reg rem_sl () (rem_sl rem_sl~ -> dir/loc_reg)
-
-1 mv rem_sl loc_reg [mv: `rem_sl' and `loc_reg' are the same file ](loc_reg) (rem_sl -> dir/loc_reg)
-0 mv -b rem_sl loc_reg (loc_reg -> dir/loc_reg loc_reg~) ()
-
-1 mv loc_sl rem_reg [mv: `loc_sl' and `rem_reg' are the same file ](loc_sl -> rem_reg) (rem_reg)
-0 mv -b loc_sl rem_reg () (rem_reg -> rem_reg rem_reg~)
-
-0 mv rem_reg loc_sl (loc_sl) ()
-0 mv -b rem_reg loc_sl (loc_sl loc_sl~ -> rem_reg) ()
+1 cp loc_reg rem_sl
+ [cp: `loc_reg' and `rem_sl' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+0 cp --rem loc_reg rem_sl
+ (loc_reg) (rem_sl)
+0 cp --rem -d loc_reg rem_sl
+ (loc_reg) (rem_sl)
+0 cp --rem -b loc_reg rem_sl
+ (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg)
+0 cp -b loc_reg rem_sl
+ (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg)
+0 cp -bd loc_reg rem_sl
+ (loc_reg) (rem_sl rem_sl~ -> dir/loc_reg)
+1 cp -d loc_reg rem_sl
+ [cp: `loc_reg' and `rem_sl' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+
+1 cp rem_sl loc_reg
+ [cp: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+1 cp --rem rem_sl loc_reg
+ [cp: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+1 cp --rem -d rem_sl loc_reg
+ [cp: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+1 cp --rem -b rem_sl loc_reg
+ [cp: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+1 cp -b rem_sl loc_reg
+ [cp: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+0 cp -bd rem_sl loc_reg
+ (loc_reg -> dir/loc_reg loc_reg~) (rem_sl -> dir/loc_reg)
+ symlink-loop
+ symlink-loop
+1 cp -d rem_sl loc_reg
+ [cp: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+
+1 cp loc_sl rem_reg
+ [cp: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+1 cp --rem loc_sl rem_reg
+ [cp: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+1 cp --rem -d loc_sl rem_reg
+ [cp: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+1 cp --rem -b loc_sl rem_reg
+ [cp: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+1 cp -b loc_sl rem_reg
+ [cp: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+0 cp -bd loc_sl rem_reg
+ (loc_sl -> rem_reg) (rem_reg -> rem_reg rem_reg~)
+ symlink-loop
+ symlink-loop
+1 cp -d loc_sl rem_reg
+ [cp: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+
+1 cp rem_reg loc_sl
+ [cp: `rem_reg' and `loc_sl' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+0 cp --rem rem_reg loc_sl
+ (loc_sl) (rem_reg)
+0 cp --rem -d rem_reg loc_sl
+ (loc_sl) (rem_reg)
+0 cp --rem -b rem_reg loc_sl
+ (loc_sl loc_sl~ -> rem_reg) (rem_reg)
+0 cp -b rem_reg loc_sl
+ (loc_sl loc_sl~ -> rem_reg) (rem_reg)
+0 cp -bd rem_reg loc_sl
+ (loc_sl loc_sl~ -> rem_reg) (rem_reg)
+1 cp -d rem_reg loc_sl
+ [cp: `rem_reg' and `loc_sl' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+
+0 mv loc_reg rem_sl
+ () (rem_sl)
+0 mv -b loc_reg rem_sl
+ () (rem_sl rem_sl~ -> dir/loc_reg)
+
+1 mv rem_sl loc_reg
+ [mv: `rem_sl' and `loc_reg' are the same file]
+ (loc_reg) (rem_sl -> dir/loc_reg)
+0 mv -b rem_sl loc_reg
+ (loc_reg -> dir/loc_reg loc_reg~) ()
+
+1 mv loc_sl rem_reg
+ [mv: `loc_sl' and `rem_reg' are the same file]
+ (loc_sl -> rem_reg) (rem_reg)
+0 mv -b loc_sl rem_reg
+ () (rem_reg -> rem_reg rem_reg~)
+
+0 mv rem_reg loc_sl
+ (loc_sl) ()
+0 mv -b rem_reg loc_sl
+ (loc_sl loc_sl~ -> rem_reg) ()
 
 EOF
 
diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index dbb558483..a40f434fa 100755
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -41,7 +41,10 @@ chmod go+x . || framework_failure
 
 
 # Ensure that $NON_ROOT_USERNAME can access the required version of mv.
-version=`setuidgid $NON_ROOT_USERNAME env PATH="$PATH" mv --version|sed -n '1s/.* //p'`
+version=`
+  setuidgid $NON_ROOT_USERNAME env PATH="$PATH" mv --version |
+  sed -n '1s/.* //p'
+`
 case $version in
   $PACKAGE_VERSION) ;;
   *) echo "$0: cannot access just-built mv as user $NON_ROOT_USERNAME" 1>&2
diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests
index 0dabdb682..0349a12a0 100755
--- a/tests/pr/pr-tests
+++ b/tests/pr/pr-tests
@@ -256,8 +256,10 @@ my @tv = (
 ['10md', '-J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'Jml24f-lm-lo'], 0],
 ['10me', '-W 35 -J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35Jml24f-lmlo'], 0],
 ['10mf', '-w 35 -J -m -l 24 -f', [\'tFFt-lm', \'loli'], [\'W35Jml24f-lmlo'], 0],
-['10mg', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'tFFt-lm', \'loli'], [\'nJml24f-lmlmlo'], 0],
-['10mh', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'loli', \'tFFt-lm'], [\'nJml24f-lmlolm'], 0],
+['10mg', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'tFFt-lm', \'loli'],
+ [\'nJml24f-lmlmlo'], 0],
+['10mh', '-n.3 -J -m -l 24 -f', [\'tFFt-lm', \'loli', \'tFFt-lm'],
+ [\'nJml24f-lmlolm'], 0],
 ['10aa', '-a -3 -l 24 -f', [\'tFFt-lm'], [\'a3l24f-lm'], 0],
 ['10ab', '-W 35 -a -3 -l 24 -f', [\'tFFt-lm'], [\'W35a3l24f-lm'], 0],
 ['10ac', '-J -a -3 -l 24 -f', [\'tFFt-lm'], [\'Ja3l24f-lm'], 0],
@@ -268,12 +270,18 @@ my @tv = (
 ['10bd', '-W 35 -J -b -3 -l 24 -f', [\'tFFt-lm'], [\'W35Jb3l24f-lm'], 0],
 #
 # merge files (-m option)  use separator string (-S option)
-['11sa', '-n.3 -S:--: -m -l 20 -f', [\'tFFt-bl', \'FnFn'], [\'nSml20-bl-FF'], 0],
-['11sb', '-n.3 -S:--: -m -l 24 -f', [\'tFFt-bl', \'FnFn'], [\'nSml24-bl-FF'], 0],
-['11se', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn'], [\'nSml20-t-t-FF'], 0],
-['11sf', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn'], [\'nSml24-t-t-FF'], 0],
-['11sg', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn', \'FnFn'], [\'nSml20-t-tFFFF'], 0],
-['11sh', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn', \'FnFn'], [\'nSml24-t-tFFFF'], 0],
+['11sa', '-n.3 -S:--: -m -l 20 -f', [\'tFFt-bl', \'FnFn'],
+ [\'nSml20-bl-FF'], 0],
+['11sb', '-n.3 -S:--: -m -l 24 -f', [\'tFFt-bl', \'FnFn'],
+ [\'nSml24-bl-FF'], 0],
+['11se', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn'],
+ [\'nSml20-t-t-FF'], 0],
+['11sf', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn'],
+ [\'nSml24-t-t-FF'], 0],
+['11sg', '-n.3 -S:--: -m -l 20 -f', [\'tn', \'tn', \'FnFn', \'FnFn'],
+ [\'nSml20-t-tFFFF'], 0],
+['11sh', '-n.3 -S:--: -m -l 24 -f', [\'tn', \'tn', \'FnFn', \'FnFn'],
+ [\'nSml24-t-tFFFF'], 0],
 #
 # left margin (-o option) and separator string (-S option)
 ['12aa', '-o3 -a -3 -l24 -f', [\'tn'], [\'o3a3l24f-tn'], 0],
@@ -284,7 +292,8 @@ my @tv = (
 ['12bc', '-o3 -b -3 -S:--: -n. -l24 -f', [\'tn'], [\'o3b3Snl24f-tn'], 0],
 ['12ma', '-o3 -m -l24 -f', [\'tFFt-bl', \'tn'], [\'o3ml24f-bl-tn'], 0],
 ['12mb', '-o3 -m -S:--: -l24 -f', [\'tFFt-bl', \'tn'], [\'o3mSl24f-bl-tn'], 0],
-['12mc', '-o3 -m -S:--: -n. -l24 -f', [\'tFFt-bl', \'tn'], [\'o3mSnl24fbltn'], 0],
+['12mc', '-o3 -m -S:--: -n. -l24 -f', [\'tFFt-bl', \'tn'],
+ [\'o3mSnl24fbltn'], 0],
 ['12md', '-o3 -J -m -l24 -f', [\'tFFt-lm', \'loli'], [\'o3Jml24f-lm-lo'], 0],
 #
 #
@@ -342,18 +351,23 @@ my @tv = (
 # SunOS.5.5.1-BUG: 8 input spaces --> 11 output spaces between a and b;
 ['i-opt-a', '-tn -i5 -h ""', "a        b\n", "    1	a	    b\n", 0],
 # SunOS.5.5.1-BUG: 8 input spaces -->  9 output spaces between a and b;
-['i-opt-b', '-tn -i5 -o9 -h ""', "a        b\n", "		   1	a	    b\n", 0],
+['i-opt-b', '-tn -i5 -o9 -h ""', "a        b\n",
+ "		   1	a	    b\n", 0],
 #
 # line number overflow not allowed: cut off leading digits;
 # don't adapt other UNIXes, no real standard to follow, a consequent
 # programming of column handling may change the GNU pr concept.
-['ncut-a', '-tn2 -N98', "y\ny\ny\ny\ny\n", "98	y\n99	y\n00	y\n01	y\n02	y\n", 0],
-['ncut-b', '-tn:2 -N98', "y\ny\ny\ny\ny\n", "98:y\n99:y\n00:y\n01:y\n02:y\n", 0],
+['ncut-a', '-tn2 -N98', "y\ny\ny\ny\ny\n",
+ "98	y\n99	y\n00	y\n01	y\n02	y\n", 0],
+['ncut-b', '-tn:2 -N98', "y\ny\ny\ny\ny\n",
+ "98:y\n99:y\n00:y\n01:y\n02:y\n", 0],
 
 ['margin-0', '-o 0', '', '', 0],
 
 # BUG fixed: that leading space on 3rd line of output should not be there
-['dbl-sp-a', '-d -l 14 -h ""', "1\n2\n", "\n\n-- Date/Time --                                                   Page 1\n\n\n1\n\n2\n\n\n\n\n\n\n", 0],
+['dbl-sp-a', '-d -l 14 -h ""', "1\n2\n",
+ "\n\n-- Date/Time --                                                   "
+ . "Page 1\n\n\n1\n\n2\n\n\n\n\n\n\n", 0],
 # This test failed with 1.22e and earlier.
 ['dbl-sp-b', '-d -t', "1\n2\n", "1\n\n2\n\n", 0],
 
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 416c97e98..49cd44169 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -31,7 +31,10 @@ touch a/b || framework_failure
 
 # Try to ensure that $NON_ROOT_USERNAME can access
 # the required version of rm.
-rm_version=`setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version|sed -n '1s/.* //p'`
+rm_version=`
+  setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version |
+  sed -n '1s/.* //p'
+`
 case $rm_version in
   $PACKAGE_VERSION) ;;
   *) skip_test_ "cannot access just-built rm as user $NON_ROOT_USERNAME";;
diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always
index 7a1297046..6c11255c3 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -68,15 +68,15 @@ test -f file4-1 || fail=1
 
 cat <<\EOF > expout || fail=1
 EOF
-cat <<\EOF > experr || fail=1
+sed 's/@remove_empty/rm: remove regular empty file/g' <<\EOF > experr || fail=1
 no WHEN
-rm: remove regular empty file `file1-1'? rm: remove regular empty file `file1-2'? .
+@remove_empty `file1-1'? @remove_empty `file1-2'? .
 WHEN=never
 .
 WHEN=once
 rm: remove all arguments recursively? .
 WHEN=always
-rm: remove regular empty file `file4-1'? rm: remove regular empty file `file4-2'? .
+@remove_empty `file4-1'? @remove_empty `file4-2'? .
 -f overrides --interactive
 .
 --interactive overrides -f