summaryrefslogtreecommitdiff
path: root/source3/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-21 18:26:46 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-21 18:26:46 +0200
commit8ac2da0d0947c3dcfc9c1e7b38739fece395642d (patch)
treede963c46c35a4bec44df90da6190aa055646b301 /source3/selftest
parente422f638bc3b3780bf5784b1ce218d3e87d068cf (diff)
downloadsamba-8ac2da0d0947c3dcfc9c1e7b38739fece395642d.tar.gz
samba-8ac2da0d0947c3dcfc9c1e7b38739fece395642d.tar.bz2
samba-8ac2da0d0947c3dcfc9c1e7b38739fece395642d.zip
Allow running individual tests in the testsuite, normalize test names, fix some tests.
Diffstat (limited to 'source3/selftest')
-rwxr-xr-xsource3/selftest/tests.sh12
1 files changed, 7 insertions, 5 deletions
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