[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[coreutils] [PATCH] Cater for extra strace output when building 32-on-64
From: |
Nix |
Subject: |
[coreutils] [PATCH] Cater for extra strace output when building 32-on-64. |
Date: |
Sat, 30 Oct 2010 14:20:21 +0100 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) XEmacs/21.5-b29 (linux) |
When building 32-bit coreutils on a 64-bit Linux platform, the
stat-free-symlinks test fails because the strace output it diffs
against contains an extra informative line emitted by strace
of the general form
[ Process PID=28429 runs in 32 bit mode. ]
So dike that line out, if it exists, before running the comparison.
---
tests/ls/stat-free-symlinks | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks
index 6843b97..3f1e732 100755
--- a/tests/ls/stat-free-symlinks
+++ b/tests/ls/stat-free-symlinks
@@ -42,6 +42,10 @@ LS_COLORS='or=0:mi=0:ex=01;32:ln=01;35' \
# line showing ls had called stat on "x".
grep '^stat("x"' err && fail=1
+# Eliminate warnings from 'out' relating to 32-bit mode on 64-bit platforms.
+grep -v 'Process PID=[1-9][0-9]* runs in 32 bit mode.' < out > out-destrace
+mv -f out-destrace out
+
# Check that output is colorized, as requested, too.
{
printf '\033[0m\033[01;35mlink-to-x\033[0m@\n'
--
1.7.3.125.g963bc.dirty
- [coreutils] [PATCH] Cater for extra strace output when building 32-on-64.,
Nix <=