* 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.

diff --git a/ChangeLog b/ChangeLog
index 18e90ea1a65a850e03a2a072532f19a8ea212fad..57dc2fa6c2f62b54a162bab2955bafadaf8c9fae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 4a9047f2a8502a898df8ebe4f40eda8c5ae1061e..a03c4de580dd1aba314d3bd5f1b37f286c3a59ab 100755 (executable)
--- 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