selftest: allow environment options

[metze/samba/wip.git] / source4 / selftest / tests.sh

diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5f148909e23cb596698edff7d654a5a05428a8b9..5c2b0792eb431786a91aa06d394f6522eb10da04 100755 (executable)
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -54,11 +54,36 @@ plansmbtorturetest() {
        plantest "$modname" "$env" $cmdline
 }
 
-bin/smbtorture -V
-
 samba4srcdir=.
 samba4bindir=$samba4srcdir/bin
-smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
+smb4torture="$samba4bindir/smbtorture${EXEEXT}"
+$smb4torture -V
+
+prefix_abs="$SELFTEST_PREFIX/s4client"
+
+test -d "$prefix_abs" || mkdir "$prefix_abs"
+conffile="$SELFTEST_CONFFILE"
+
+TORTURE_OPTIONS=""
+TORTURE_OPTIONS="$TORTURE_OPTIONS --configfile=$conffile"
+TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME"
+TORTURE_OPTIONS="$TORTURE_OPTIONS --target=$SELFTEST_TARGET"
+TORTURE_OPTIONS="$TORTURE_OPTIONS --basedir=$prefix_abs"
+if [ -n "$SELFTEST_VERBOSE" ]; then
+       TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:progress=no"
+fi
+TORTURE_OPTIONS="$TORTURE_OPTIONS --format=subunit"
+if [ -n "$SELFTEST_QUICK" ]; then
+       TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:quick=yes"
+fi
+smb4torture="$smb4torture $TORTURE_OPTIONS"
+
+echo "OPTIONS $TORTURE_OPTIONS"
+
+SMB_CONF_PATH="$conffile"
+export SMB_CONF_PATH
+CONFIGURATION="--configfile=$conffile"
+export CONFIGURATION
 
 # Simple tests for LDAP and CLDAP
 
@@ -239,9 +264,10 @@ for t in `$smb4torture --list | grep "^LOCAL-" | xargs`; do
        plansmbtorturetest "$t" none ncalrpc: "$*"
 done
 
-if test -f $samba4bindir/tdbtorture
+tdbtorture4="$samba4bindir/tdbtorture${EXEEXT}"
+if test -f $tdbtorture4
 then
-       plantest "tdb.stress" none $VALGRIND $samba4bindir/tdbtorture
+       plantest "tdb.stress" none $VALGRIND $tdbtorture4
 fi
 
 # Pidl tests
@@ -272,8 +298,8 @@ plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh
 plantest "blackbox.locktest" dc $samba4srcdir/torture/tests/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
 plantest "blackbox.masktest" dc $samba4srcdir/torture/tests/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
 plantest "blackbox.gentest" dc $samba4srcdir/torture/tests/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
-plantest "blackbox.wbinfo" dc $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc"
-plantest "blackbox.wbinfo" member $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member"
+plantest "blackbox.wbinfo" dc:local $samba4srcdir/../nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc"
+plantest "blackbox.wbinfo" member:local $samba4srcdir/../nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member"
 
 # Tests using the "Simple" NTVFS backend
 
@@ -354,9 +380,10 @@ for env in dc member; do
        done
 done
 
-if test -f $samba4bindir/nsstest 
+nsstest4="$samba4bindir/nsstest${EXEEXT}"
+if test -f $nsstest4
 then
-       plantest "nss.test using winbind" member $VALGRIND $samba4bindir/nsstest $samba4bindir/shared/libnss_winbind.so
+       plantest "nss.test using winbind" member $VALGRIND $nsstest4 $samba4bindir/shared/libnss_winbind.so
 fi
 
 PYTHON=/usr/bin/python
@@ -376,7 +403,7 @@ plantest "samr.python" dc $SUBUNITRUN samba.tests.dcerpc.sam
 plantest "dcerpc.bare.python" dc $SUBUNITRUN samba.tests.dcerpc.bare
 plantest "unixinfo.python" dc $SUBUNITRUN samba.tests.dcerpc.unix
 plantest "samdb.python" none $SUBUNITRUN samba.tests.samdb
-plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests
+plantest "tevent.python" none PYTHONPATH="$PYTHONPATH:../lib/tevent" $SUBUNITRUN tests
 plantest "messaging.python" none PYTHONPATH="$PYTHONPATH:lib/messaging/tests" $SUBUNITRUN bindings
 plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
 plantest "subunit.python" none $SUBUNITRUN subunit