From 95fafa9d8398e86391cbd9ced9ea24a28b069f5f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 27 Sep 2009 16:34:59 +0200
Subject: selftest: Prefer system tap2subunit if available.

---
 source4/selftest/tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/selftest')

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
-- 
cgit