summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-08-18 07:25:28 +0200
committerJim Meyering <meyering@redhat.com>2012-08-18 07:39:49 +0200
commitb8104e47ca23cb7ba57e0c06451df093e6b02593 (patch)
tree8c454f14273a8873b5abe5e0ff9ed13675657d15
parent574b7c7dbec8821d03a462796968847783d07c29 (diff)
downloadcoreutils-b8104e47ca23cb7ba57e0c06451df093e6b02593.tar.gz
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.
-rw-r--r--tests/init.cfg6
-rwxr-xr-xtests/misc/sort-stale-thread-mem2
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/init.cfg b/tests/init.cfg
index 4ff5ad4d5..f223f13a5 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 c19f62ee3..05cc9ba1c 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'