summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-09-27 16:34:59 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-09-27 16:34:59 +0200
commit95fafa9d8398e86391cbd9ced9ea24a28b069f5f (patch)
treefee0cc5fd3c0e191df307322f2bd1402c7d503ef /source4
parentdb55ea08bca48a3b8d6332f08a9db44f91b6d8db (diff)
downloadsamba-95fafa9d8398e86391cbd9ced9ea24a28b069f5f.tar.gz
samba-95fafa9d8398e86391cbd9ced9ea24a28b069f5f.tar.bz2
samba-95fafa9d8398e86391cbd9ced9ea24a28b069f5f.zip
selftest: Prefer system tap2subunit if available.
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/selftest/tests.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index ea00bf2909..e145ea0e3b 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -82,7 +82,11 @@ plansmbtorturetest() {
samba4srcdir="`dirname $0`/.."
samba4bindir="$BUILDDIR/bin"
smb4torture="$samba4bindir/smbtorture${EXEEXT}"
-TAP2SUBUNIT="$PERL $samba4srcdir/../lib/subunit/tap2subunit"
+if which tap2subunit 2>/dev/null; then
+ TAP2SUBUNIT=tap2subunit
+else
+ TAP2SUBUNIT="$PERL $samba4srcdir/../lib/subunit/tap2subunit"
+fi
$smb4torture -V
bbdir=../testprogs/blackbox