sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Use socket wrapper for selftest.pl, find binaries correctly.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-21 17:48:05 +02:00
parent fe02004865
commit e422f638bc
4 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
selftest/selftest.pl
View File

@ -300,14 +300,12 @@ Target Specific:
--socket-wrapper-keep-pcap keep all pcap files, not just those for tests that
failed
--socket-wrapper enable socket wrapper
--bindir=PATH path to target binaries
--expected-failures=FILE specify list of tests that is guaranteed to fail
Samba4 Specific:
--ldap=openldap|fedora-ds back samba onto specified ldap server
Samba3 Specific:
--bindir=PATH path to binaries
Kvm Specific:
--image=PATH path to KVM image
@ -447,12 +445,13 @@ if ($opt_target eq "samba4") {
require target::Samba4;
$target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup");
} elsif ($opt_target eq "samba3") {
if ($opt_socket_wrapper and `$opt_bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
my $bindir = ($opt_bindir or "$srcdir/bin");
if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting....");
}
$testenv_default = "dc";
require target::Samba3;
$target = new Samba3($opt_bindir);
$target = new Samba3($bindir);
} elsif ($opt_target eq "win") {
die("Windows tests will not run with socket wrapper enabled.")
if ($opt_socket_wrapper);

3
source3/Makefile.in
View File

@ -2811,7 +2811,8 @@ 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
--exclude=$(srcdir)/selftest/skip \
--socket-wrapper
# Check for Winbind struct 32/64bit padding
test_wbpad:

15
source3/selftest/skip
View File

@ -0,0 +1,15 @@
samba3.smbconftort # Errors, needs smb.conf file
samba3.randomipc
samba3.negnowait
samba3.nbench
samba3.errmapextract
samba3.trans2scan
samba3.nttransscan
samba3.deny1
samba3.deny2
samba3.openattr
samba3.casetable
samba3.eatest
samba3.mangle
samba3.utable
samba3.pipe_number

18
source3/selftest/tests.sh
View File

@ -49,4 +49,20 @@ BINDIR=`dirname $0`/../bin
plantest "talloctort" none $VALGRIND $BINDIR/talloctort
plantest "replacetort" none $VALGRIND $BINDIR/replacetort
plantest "tdbtorture" none $VALGRIND $BINDIR/tdbtorture
#plantest "smbconftort" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION
plantest "smbconftort" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION
tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE "
tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
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
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