diff options
author | Jim Meyering <jim@meyering.net> | 2006-09-12 09:33:40 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2006-09-12 09:33:40 +0000 |
commit | e1fb2a80bb2d4207910126837b79d4c5fd53d911 (patch) | |
tree | b07abebd11dd0f9856ee26821b750e1cc4fb8557 | |
parent | fb15bc880ae64ac6ca046021221f53a83f66727f (diff) | |
download | coreutils-e1fb2a80bb2d4207910126837b79d4c5fd53d911.tar.xz |
* tests/mv/atomic: Check for specific strace output, rather than
simply nonempty. RHEL AS 4 would fail this test due to strace
generating "[ Process PID=14434 runs in 32 bit mode. ]".
Reported by Nelson Beebe.
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | tests/mv/atomic | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2006-09-12 Jim Meyering <jim@meyering.net> + + * tests/mv/atomic: Check for specific strace output, rather than + simply nonempty. RHEL AS 4 would fail this test due to strace + generating "[ Process PID=14434 runs in 32 bit mode. ]". + Reported by Nelson Beebe. + 2006-09-11 Jim Meyering <jim@meyering.net> * src/remove.c (remove_dir): Move new cache_stat_init call onto diff --git a/tests/mv/atomic b/tests/mv/atomic index 4a9047f2a..a03c4de58 100755 --- a/tests/mv/atomic +++ b/tests/mv/atomic @@ -58,8 +58,7 @@ fi fail=0 strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1 -cat <<\EOF > exp || fail=1 -EOF +grep unlink out && fail=1 # Ensure that the source, s1, is gone. ls -dl s1 > /dev/null 2>&1 && fail=1 @@ -67,7 +66,4 @@ ls -dl s1 > /dev/null 2>&1 && fail=1 # Ensure that the destination, s2, contains the link from s1. test "`readlink s2`" = t1 || fail=1 -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null - (exit $fail); exit $fail |