If strace malfunctions, skip the test rather than failing it.

* tests/mv/atomic: Required on a mips-unknown-linux-gnu system
running the aging linux-2.4.27-mipscvs-20040814.

diff --git a/ChangeLog b/ChangeLog
index fdb48b5..33638db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-24  Jim Meyering  <jim@meyering.net>
+
+       If strace malfunctions, skip the test rather than failing it.
+       * tests/mv/atomic: Required on a mips-unknown-linux-gnu system
+       running the aging linux-2.4.27-mipscvs-20040814.
+
 2007-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
        * src/pathchk.c: Don't include euidaccess.h, as we don't call

diff --git a/tests/mv/atomic b/tests/mv/atomic
index 1fa0736..728bbfa 100755 (executable)
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -1,7 +1,7 @@
 #!/bin/sh
 # ensure that mv doesn't first unlink its destination in one particular case
 
-# Copyright (C) 2006, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006-2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -55,6 +55,12 @@ if test "$skip" = 1; then
   (exit 77); exit 77
 fi
 
+strace -qe unlink echo > /dev/null 2>&1 || skip=1
+if test "$skip" = 1; then
+  echo "$0: strace doesn't work, so skipping this test" 1>&2
+  (exit 77); exit 77
+fi
+
 fail=0
 
 strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1