From: Jim Meyering <meyering@redhat.com>
Date: Sat, 18 Aug 2012 05:25:28 +0000 (+0200)
Subject: tests: wrap the valgrind-requiring assertion in a function
X-Git-Tag: v8.19~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8104e47ca23cb7ba57e0c06451df093e6b02593;p=thirdparty%2Fcoreutils.git

tests: wrap the valgrind-requiring assertion in a function

* tests/init.cfg (require_valgrind_): New function...
* tests/misc/sort-stale-thread-mem: ...extracted from here.
---

diff --git a/tests/init.cfg b/tests/init.cfg
index 4ff5ad4d54..f223f13a5e 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -160,6 +160,12 @@ require_strace_()
   fi
 }
 
+# Skip the current test if valgrind doesn't work.
+require_valgrind_()
+{
+  valgrind --help >/dev/null || skip_ "requires valgrind"
+}
+
 require_setfacl_()
 {
   setfacl -m user::rwx . \
diff --git a/tests/misc/sort-stale-thread-mem b/tests/misc/sort-stale-thread-mem
index c19f62ee3e..05cc9ba1c2 100755
--- a/tests/misc/sort-stale-thread-mem
+++ b/tests/misc/sort-stale-thread-mem
@@ -22,8 +22,8 @@
 print_ver_ sort
 
 very_expensive_
+require_valgrind_
 
-valgrind --help >/dev/null || skip_ "requires valgrind"
 grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null ||
   skip_ 'requires pthreads'