From 6b0e6fc0b35b438675bc8d5827d97070d66fac04 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 9 Jun 2009 18:09:27 +0200 Subject: s4-tests: Add separate variable for tap2subunit. --- source4/selftest/tests.sh | 5 +++-- 1 file 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 -- cgit