summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in7
-rwxr-xr-xsource3/selftest/tests.sh12
2 files changed, 13 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 09c1dd7b35..01255df087 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2807,12 +2807,17 @@ valgrindtest:: all torture timelimit
VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
+SELFTEST_FORMAT = plain
+
selftest:: all torture timelimit
@../selftest/selftest.pl --prefix=st --target=samba3 \
--testlist="$(srcdir)/selftest/tests.sh|" \
--expected-failures=$(srcdir)/selftest/knownfail \
--exclude=$(srcdir)/selftest/skip \
- --socket-wrapper
+ --socket-wrapper $(TESTS) --format=$(SELFTEST_FORMAT)
+
+selftest-%:
+ $(MAKE) selftest TESTS=$*
# Check for Winbind struct 32/64bit padding
test_wbpad:
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 65ecfc0b5d..98568b6bb3 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -45,6 +45,8 @@ normalize_testname() {
}
BINDIR=`dirname $0`/../bin
+SCRIPTDIR=`dirname $0`/../script/tests
+export SCRIPTDIR
plantest "talloctort" none $VALGRIND $BINDIR/talloctort
plantest "replacetort" none $VALGRIND $BINDIR/replacetort
@@ -59,10 +61,10 @@ tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
for t in $tests; do
- plantest "$t" dc $VALGRIND $BINDIR/smbtorture \$UNC -U"\$USERNAME"%"\$PASSWORD" $t
+ name=`normalize_testname $t`
+ plantest "$name" dc $VALGRIND $BINDIR/smbtorture //\$SERVER/tmp -U\$USERNAME%\$PASSWORD $t
done
-plantest "blackbox.smbclient" dc script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP
-plantest "blackbox.wbinfo" dc script/tests/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$USERNAME \$PASSWORD
-plantest "blackbox.net" dc script/tests/test_net_s3.sh
-
+plantest "blackbox.smbclient" dc BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP
+plantest "blackbox.wbinfo" dc BINDIR="$BINDIR" script/tests/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$USERNAME \$PASSWORD
+plantest "blackbox.net" dc BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" script/tests/test_net_s3.sh