From: Pádraig Brady Date: Thu, 16 Oct 2014 09:33:46 +0000 (+0100) Subject: tests: fix test hang with unstable inodes in /proc X-Git-Tag: v8.24~195 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=437f24764963ca2935e1bce368667f8270275a4b;p=thirdparty%2Fcoreutils.git tests: fix test hang with unstable inodes in /proc * cp/proc-zero-len.sh: Search the 'err' file for the error to ignore, not stdin. --- diff --git a/tests/cp/proc-zero-len.sh b/tests/cp/proc-zero-len.sh index 3fcd5aab13..8dd8460605 100755 --- a/tests/cp/proc-zero-len.sh +++ b/tests/cp/proc-zero-len.sh @@ -31,7 +31,7 @@ cat $f > out || fail=1 # number of the file changed during the cp run. cp $f exp 2>err \ || { fail=1; - grep 'replaced while being copied' \ + grep 'replaced while being copied' err \ && skip_ "File $f is being replaced while being copied"; } # Don't simply compare contents; they might differ,