From: Nix <nix@esperi.org.uk>
Date: Mon, 1 Nov 2010 15:46:01 +0000 (+0000)
Subject: tests: fix a false positive for 32 bit on 64 bit hosts
X-Git-Tag: v8.7~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=272f8bf0ac23d7c9ac96f3cb53e114cd3566875b;p=thirdparty%2Fcoreutils.git

tests: fix a false positive for 32 bit on 64 bit hosts

* tests/ls/stat-free-symlinks: strace currently outputs an
informational message about arch difference to stdout.
Therefore we need to strip that before comparison.
---

diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks
index 6843b97fd5..7af9e344d5 100755
--- a/tests/ls/stat-free-symlinks
+++ b/tests/ls/stat-free-symlinks
@@ -36,7 +36,10 @@ ln -s x link-to-x || framework_failure
 # symlink and an executable file properly.
 
 LS_COLORS='or=0:mi=0:ex=01;32:ln=01;35' \
-  strace -qe stat ls -F --color=always x link-to-x > out 2> err || fail=1
+  strace -qe stat ls -F --color=always x link-to-x > out.tmp 2> err || fail
+# Elide info messages strace can send to stdout of the form:
+#   [ Process PID=1234 runs in 32 bit mode. ]
+sed '/Process PID=/d' out.tmp > out
 
 # With coreutils 6.9 and earlier, this file would contain a
 # line showing ls had called stat on "x".