On 05/03/19 13:17, Assaf Gordon wrote: > Hello Pádraig, > > On 2019-03-04 3:18 a.m., Pádraig Brady wrote: >> We plan to release coreutils-8.31 in the coming week > > Thanks for all the hard work, and for cleaning up and finalizing the > 'env' patch. > > > Some test results: >
> On Mac OS X: > FAIL: tests/id/zero Due to sed differences. The attached should address it. cheers, Pádraig
>From 2ef6c433041386c29e729510c4b0fd792b597ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> Date: Wed, 6 Mar 2019 21:04:26 -0800 Subject: [PATCH] tests: id/zero: avoid false failure due to sed differences * tests/id/zero.sh: sed on OSX will output a \n even if the input doesn't have a \n on the last "line". So ensure we always have a trailing '\n' to avoid the disparity. --- tests/id/zero.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/id/zero.sh b/tests/id/zero.sh index 085ea7c..471962c 100755 --- a/tests/id/zero.sh +++ b/tests/id/zero.sh @@ -89,13 +89,15 @@ for o in G Gr ; do for n in '' n ; do id -${o}${n} $users >> gtmp1 || { test $? -ne 1 || test -z "$n" && fail=1; } + printf '\n' >> gtmp1 || framework_failure_ + id -${o}${n}z $users > gtmp2 || { test $? -ne 1 || test -z "$n" && fail=1; } # we replace all NULs with spaces, the result we get is there are two # consecutive spaces instead of two NUL's, we pass this to sed # to replace more than 1 space with a newline. This is ideally where a new # line should be. This should make the output similar to without -z. - tr '\0' ' ' < gtmp2 | sed "s/ /\\$NL/g" >> gtmp3 + { tr '\0' ' ' < gtmp2; printf '\n'; } | sed "s/ /\\$NL/g" >> gtmp3 done done compare gtmp1 gtmp3 || fail=1 -- 2.9.3
