summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-06-09 18:09:27 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-06-09 21:54:05 +0200
commit6b0e6fc0b35b438675bc8d5827d97070d66fac04 (patch)
tree79406b7d5210f0b242a86b1ab1c42ff4d736405f /source4/selftest
parent9af9a43464d5e900b16b9ef29bbe516e70867e90 (diff)
downloadsamba-6b0e6fc0b35b438675bc8d5827d97070d66fac04.tar.gz
samba-6b0e6fc0b35b438675bc8d5827d97070d66fac04.tar.bz2
samba-6b0e6fc0b35b438675bc8d5827d97070d66fac04.zip
s4-tests: Add separate variable for tap2subunit.
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/tests.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index b65a6e3bd7..b0717aa76b 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -62,6 +62,7 @@ plansmbtorturetest() {
samba4srcdir="`dirname $0`/.."
samba4bindir="$BUILDDIR/bin"
smb4torture="$samba4bindir/smbtorture${EXEEXT}"
+TAP2SUBUNIT="$PERL $samba4srcdir/../lib/subunit/tap2subunit"
$smb4torture -V
bbdir=../testprogs/blackbox
@@ -291,9 +292,9 @@ if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
for f in $samba4srcdir/../pidl/tests/*.pl; do
- plantest "pidl.`basename $f .pl`" none $PERL $f "|" $PERL $samba4srcdir/../lib/subunit/tap2subunit
+ plantest "pidl.`basename $f .pl`" none $PERL $f "|" $TAP2SUBUNIT
done
- plantest "selftest.samba4.pl" none $PERL $samba4srcdir/../selftest/test_samba4.pl "|" $PERL $samba4srcdir/../lib/subunit/tap2subunit
+ plantest "selftest.samba4.pl" none $PERL $samba4srcdir/../selftest/test_samba4.pl "|" $TAP2SUBUNIT
else
echo "Skipping pidl tests - Test::More not installed"
fi