[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-245-g01f30a5
Stefan Metzmacher
metze at samba.org
Fri Jan 30 12:41:18 GMT 2009
The branch, master has been updated
via 01f30a5e8e6d860391e79896f6d1de782e239f68 (commit)
via 3f967153c0f87febb2e0d75d24080faa9d647666 (commit)
via 6b128f03d500b13468c666db51c87eb2e194f2ca (commit)
via 4b541c6f030e9459df35337bce3d8ce7ba92a2c6 (commit)
from 22e3004829fe742efdbf750611749b9aaf585515 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 01f30a5e8e6d860391e79896f6d1de782e239f68
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 13:33:45 2009 +0100
s4:selftest: run RPC-COUNTCALLS as dc:local
metze
commit 3f967153c0f87febb2e0d75d24080faa9d647666
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 10:30:13 2009 +0100
s4:selftest: run ncalrpc tests in dc:local mode
metze
commit 6b128f03d500b13468c666db51c87eb2e194f2ca
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 11:03:45 2009 +0100
selftest: don't export $CONFIGURATION anymore only $SMB_CONF_PATH
metze
commit 4b541c6f030e9459df35337bce3d8ce7ba92a2c6
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 30 13:22:31 2009 +0100
pidl: fix samba3-cli test after change to cli->dispatch()
metze
-----------------------------------------------------------------------
Summary of changes:
pidl/tests/samba3-cli.pl | 4 +-
selftest/selftest.pl | 3 +-
source3/selftest/tests.sh | 2 +-
source4/selftest/tests.sh | 48 ++++++++++++++++++++++++++------------------
4 files changed, 32 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl
index d762954..5a55163 100755
--- a/pidl/tests/samba3-cli.pl
+++ b/pidl/tests/samba3-cli.pl
@@ -42,7 +42,7 @@ is($x->{res},
\t\tNDR_PRINT_IN_DEBUG(bar, &r);
\t}
- status = cli_do_rpc_ndr(cli,
+ status = cli->dispatch(cli,
mem_ctx,
&ndr_table_foo,
NDR_BAR,
@@ -86,7 +86,7 @@ is($x->{res},
\t\tNDR_PRINT_IN_DEBUG(bar, &r);
\t}
- status = cli_do_rpc_ndr(cli,
+ status = cli->dispatch(cli,
mem_ctx,
&ndr_table_foo,
NDR_BAR,
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index b4cc4c1..d4fd57e 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -648,7 +648,6 @@ if ($opt_quick) {
}
$ENV{SELFTEST_TARGET} = $opt_target;
$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
-$ENV{SELFTEST_CONFFILE} = $conffile;
my @available = ();
foreach my $fn (@testlists) {
@@ -852,7 +851,7 @@ server is pid `cat \$PIDDIR/samba.pid`
Some useful environment variables:
TORTURE_OPTIONS=\$TORTURE_OPTIONS
-CONFIGURATION=\$CONFIGURATION
+SMB_CONF_PATH=\$SMB_CONF_PATH
$envvarstr
\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 7f2c8f2..e07dee6 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -51,7 +51,7 @@ export SCRIPTDIR
plantest "talloctort3" none $VALGRIND $BINDIR/talloctort
plantest "replacetort3" none $VALGRIND $BINDIR/replacetort
plantest "tdbtorture3" none $VALGRIND $BINDIR/tdbtorture
-plantest "smbconftort3" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION
+plantest "smbconftort3" none $VALGRIND $BINDIR/smbconftort -s \$SMB_CONF_PATH
tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE "
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5c2b079..2acd376 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -60,12 +60,12 @@ smb4torture="$samba4bindir/smbtorture${EXEEXT}"
$smb4torture -V
prefix_abs="$SELFTEST_PREFIX/s4client"
+CONFIGURATION="--configfile=\$SMB_CONF_PATH"
test -d "$prefix_abs" || mkdir "$prefix_abs"
-conffile="$SELFTEST_CONFFILE"
TORTURE_OPTIONS=""
-TORTURE_OPTIONS="$TORTURE_OPTIONS --configfile=$conffile"
+TORTURE_OPTIONS="$TORTURE_OPTIONS $CONFIGURATION"
TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME"
TORTURE_OPTIONS="$TORTURE_OPTIONS --target=$SELFTEST_TARGET"
TORTURE_OPTIONS="$TORTURE_OPTIONS --basedir=$prefix_abs"
@@ -80,11 +80,6 @@ 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
for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do
@@ -119,7 +114,7 @@ slow_ncacn_np_tests="RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS"
slow_ncalrpc_tests="RPC-SAMR RPC-SAMR-PASSWORDS"
slow_ncacn_ip_tcp_tests="RPC-SAMR RPC-SAMR-PASSWORDS RPC-CRACKNAMES"
-all_tests="$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests $slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS RPC-SAMBA3-SHARESEC"
+all_tests="$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests $slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS RPC-SAMBA3-SHARESEC RPC-COUNTCALLS"
# Make sure all tests get run
for t in `$smb4torture --list | grep "^RPC-"`
@@ -133,15 +128,16 @@ done
for bindoptions in seal,padcheck $VALIDATE bigendian; do
for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
+ env="dc"
case $transport in
- ncalrpc) tests=$ncalrpc_tests ;;
+ ncalrpc) tests=$ncalrpc_tests;env="dc:local" ;;
ncacn_np) tests=$ncacn_np_tests ;;
ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;
esac
for t in $tests; do
- plantest "`normalize_testname $t` on $transport with $bindoptions" dc $VALGRIND $smb4torture $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+ plantest "`normalize_testname $t` on $transport with $bindoptions" $env $VALGRIND $smb4torture $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
done
- plantest "rpc.samba3.sharesec on $transport with $bindoptions" dc $VALGRIND $smb4torture $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN --option=torture:share=tmp RPC-SAMBA3-SHARESEC "$*"
+ plantest "rpc.samba3.sharesec on $transport with $bindoptions" $env $VALGRIND $smb4torture $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN --option=torture:share=tmp RPC-SAMBA3-SHARESEC "$*"
done
done
@@ -151,15 +147,19 @@ for bindoptions in "" $VALIDATE bigendian; do
done
done
+t="RPC-COUNTCALLS"
+plantest "`normalize_testname $t`" dc:local $VALGRIND $smb4torture "\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+
for bindoptions in connect $VALIDATE ; do
for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
+ env="dc"
case $transport in
- ncalrpc) tests=$slow_ncalrpc_tests ;;
+ ncalrpc) tests=$slow_ncalrpc_tests; env="dc:local" ;;
ncacn_np) tests=$slow_ncacn_np_tests ;;
ncacn_ip_tcp) tests=$slow_ncacn_ip_tcp_tests ;;
esac
for t in $tests; do
- plantest "`normalize_testname $t` on $transport with $bindoptions" dc $VALGRIND $smb4torture $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
+ plantest "`normalize_testname $t` on $transport with $bindoptions" $env $VALGRIND $smb4torture $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
done
done
done
@@ -206,7 +206,11 @@ for transport in $transports; do
for bindoptions in connect spnego spnego,sign spnego,seal $VALIDATE padcheck bigendian bigendian,seal; do
for ntlmoptions in \
"--option=socket:testnonblock=True --option=torture:quick=yes"; do
- plantest "rpc.echo on $transport with $bindoptions and $ntlmoptions" dc $smb4torture $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" RPC-ECHO "$*"
+ env="dc"
+ if test x"$transport" = x"ncalrpc"; then
+ env="dc:local"
+ fi
+ plantest "rpc.echo on $transport with $bindoptions and $ntlmoptions" $env $smb4torture $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" RPC-ECHO "$*"
done
done
done
@@ -224,7 +228,11 @@ for transport in $transports; do
"--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes --option=torture:quick=yes" \
"--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes" \
; do
- plantest "rpc.echo on $transport with $bindoptions and $ntlmoptions" dc $smb4torture $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
+ env="dc"
+ if test x"$transport" = x"ncalrpc"; then
+ env="dc:local"
+ fi
+ plantest "rpc.echo on $transport with $bindoptions and $ntlmoptions" $env $smb4torture $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
done
done
done
@@ -399,16 +407,16 @@ plantest "upgrade.python" none $SUBUNITRUN samba.tests.upgrade
plantest "samba.python" none $SUBUNITRUN samba.tests
plantest "provision.python" none $SUBUNITRUN samba.tests.provision
plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
-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 "samr.python" dc:local $SUBUNITRUN samba.tests.dcerpc.sam
+plantest "dcerpc.bare.python" dc:local $SUBUNITRUN samba.tests.dcerpc.bare
+plantest "unixinfo.python" dc:local $SUBUNITRUN samba.tests.dcerpc.unix
plantest "samdb.python" none $SUBUNITRUN samba.tests.samdb
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
-plantest "rpcecho.python" dc $SUBUNITRUN samba.tests.dcerpc.rpcecho
-plantest "winreg.python" dc $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
+plantest "rpcecho.python" dc:local $SUBUNITRUN samba.tests.dcerpc.rpcecho
+plantest "winreg.python" dc:local $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcerpc.registry
plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade
--
Samba Shared Repository
More information about the samba-cvs
mailing list