Avoid false-positive when testing via valgrind.

* tests/mv/atomic: Grep strace output for a more specific pattern
than just "unlink", since that got a false positive when testing
under valgrind: unlink("/tmp/valgrind_proc_9657_cmdline_A51E9991") = 0
* tests/mv/Makefile.am (TESTS_ENVIRONMENT): Define EGREP.

diff --git a/ChangeLog b/ChangeLog
index 0a1dcef892530cb7cd8b078ea6e77b87d0df2a70..bc5797f8f0261f9dcec45775467eec61c221a80b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-12  Jim Meyering  <jim@meyering.net>
+
+       Avoid false-positive when testing via valgrind.
+       * tests/mv/atomic: Grep strace output for a more specific pattern
+       than just "unlink", since that got a false positive when testing
+       under valgrind: unlink("/tmp/valgrind_proc_9657_cmdline_A51E9991") = 0
+       * tests/mv/Makefile.am (TESTS_ENVIRONMENT): Define EGREP.
+
 2006-10-28  Jim Meyering  <jim@meyering.net>
 
        * Makefile.maint (patch-check): Make it easier to regenerate

diff --git a/tests/mv/Makefile.am b/tests/mv/Makefile.am
index 927bac89b45bfe620427c43ad494801e427d91bb..57581cd8804aac7d5b70ce9eb23e2377a1488e05 100644 (file)
--- a/tests/mv/Makefile.am
+++ b/tests/mv/Makefile.am
@@ -46,5 +46,6 @@ TESTS = \
 EXTRA_DIST = $(TESTS) vfat
 TESTS_ENVIRONMENT = \
   PERL="$(PERL)" \
+  EGREP="$(EGREP)" \
   PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
   PROG=mv

diff --git a/tests/mv/atomic b/tests/mv/atomic
index bb761bdc49d13b84e2dcb24a4db80eab276bb39f..1fa07360f922f83da7f3b21a5c92262119c186b0 100755 (executable)
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -58,7 +58,7 @@ fi
 fail=0
 
 strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1
-grep unlink out && fail=1
+$EGREP 'unlink.*"s1"' out && fail=1
 
 # Ensure that the source, s1, is gone.
 ls -dl s1 > /dev/null 2>&1 && fail=1