tests: fix recent portability issues on solaris 10

* 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.
This commit is contained in:
Pádraig Brady 2017-12-21 13:52:24 +00:00
parent 70c84e046e
commit ba4b0bde2e
2 changed files with 7 additions and 5 deletions

View File

@ -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;

View File

@ -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_