]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
tests: fix recent portability issues on solaris 10
authorPádraig Brady <P@draigBrady.com>
Thu, 21 Dec 2017 13:52:24 +0000 (13:52 +0000)
committerPádraig Brady <P@draigBrady.com>
Thu, 21 Dec 2017 13:52:24 +0000 (13:52 +0000)
* tests/misc/ptx.pl: Escape the '^' character which is
otherwise considered as a line continuation character.
* tests/misc/shred-remove.sh: sed doesn't support \n.

tests/misc/ptx.pl
tests/misc/shred-remove.sh

index 219e904cba128489f6695db7b38855b230bb594e..e1810d55db3af72768a9b6b369324371e5123813 100755 (executable)
@@ -43,9 +43,9 @@ my @Tests =
 
 # with coreutils-8.28 and earlier, the -S option would infloop with
 # matches of zero-length.
-["S-infloop", '-S ^', {IN=>"a\n"}, {EXIT=>1},
-                      {ERR_SUBST=>'s/^.*reg.*ex.*length zero.*$/regexlzero/'},
-                      {ERR=>"regexlzero\n"}],
+["S-infloop", '-S \^', {IN=>"a\n"}, {EXIT=>1},
+                       {ERR_SUBST=>'s/^.*reg.*ex.*length zero.*$/regexlzero/'},
+                       {ERR=>"regexlzero\n"}],
 );
 
 @Tests = triple_test \@Tests;
index 8720eafb2916209aa532c25d6d21befd869b5e28..f35e8a51a1fdd013aceaea28cba33f21bb658822 100755 (executable)
@@ -47,8 +47,10 @@ returns_ 1 shred -n0 --remove=none $file 2>/dev/null || fail=1
 # Ensure rename passes complete.
 # coreutils-8.28 did not do the decreasing length rename
 # which may have leaked the length of the removed file name
-printf 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_. |
-sed 's/./&\n/g' | xargs touch || framework_failure_  # test level exhaustion
+NL="
+"
+printf 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_ |
+sed "s/./&\\$NL/g" | xargs touch || framework_failure_  # test level exhaustion
 touch test 000 || framework_failure_  # test level increment
 shred -vu test 2>out || fail=1
 cat <<\EOF >exp || framework_failure_