sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r22077: Import only necessary test variables, more refactoring.

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-04-04 14:24:44 +00:00 committed by Gerald (Jerry) Carter
parent c366610cbc
commit 150bb2238e
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/rpc_server/epmapper/rpc_epmapper.c
View File

@ -80,8 +80,7 @@ static uint32_t build_ep_list(TALLOC_CTX *mem_ctx,
} }
static error_status_t dcesrv_epm_Insert(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, static error_status_t dcesrv_epm_Insert(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct epm_Insert *r)
struct epm_Insert *r)
{ {
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
} }

1
source/script/tests/SocketWrapper.pm
View File

@ -31,6 +31,7 @@ sub setup_pcap($)
{ {
my ($pcap_file) = @_; my ($pcap_file) = @_;
$ENV{SOCKET_WRAPPER_PCAP_FILE} = $pcap_file;
} }
sub set_default_iface($) sub set_default_iface($)

1
source/script/tests/mktestdc.sh
View File

@ -300,7 +300,6 @@ echo "BASEDN=$BASEDN"
echo "PASSWORD=$PASSWORD" echo "PASSWORD=$PASSWORD"
echo "SRCDIR=$SRCDIR" echo "SRCDIR=$SRCDIR"
echo "PREFIX=$PREFIX" echo "PREFIX=$PREFIX"
echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
echo "LDAPDIR=$LDAPDIR" echo "LDAPDIR=$LDAPDIR"
echo "PROVISION_OPTIONS=$PROVISION_OPTIONS" echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
echo "PROVISION_ACI=$PROVISION_ACI" echo "PROVISION_ACI=$PROVISION_ACI"

14
source/script/tests/selftest.pl
View File

@ -387,14 +387,13 @@ $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";
my @torture_options = (); my @torture_options = ();
if ($opt_socket_wrapper_pcap) { if ($opt_socket_wrapper_pcap) {
$ENV{SOCKET_WRAPPER_PCAP_FILE} = $opt_socket_wrapper_pcap; SocketWrapper::setup_pcap($opt_socket_wrapper_pcap);
# Socket wrapper pcap implies socket wrapper # Socket wrapper pcap implies socket wrapper
$opt_socket_wrapper = 1; $opt_socket_wrapper = 1;
} }
my $socket_wrapper_dir; my $socket_wrapper_dir;
if ($opt_socket_wrapper) if ($opt_socket_wrapper) {
{
$socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w"); $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w");
print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n"; print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
} else { } else {
@ -433,10 +432,13 @@ if (defined($opt_skip)) {
my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir); my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir);
foreach (keys %$testenv_vars) { $ENV{$_} = $testenv_vars->{$_}; }
SocketWrapper::set_default_iface(6); SocketWrapper::set_default_iface(6);
foreach ("PASSWORD", "DOMAIN", "SERVER", "CONFIGURATION",
"USERNAME", "PREFIX", "NETBIOSNAME", "KRB5_CONFIG") {
$ENV{$_} = $testenv_vars->{$_};
}
my $interfaces = join(',', ("127.0.0.6/8", my $interfaces = join(',', ("127.0.0.6/8",
"127.0.0.7/8", "127.0.0.7/8",
"127.0.0.8/8", "127.0.0.8/8",
@ -514,7 +516,7 @@ NETBIOSNAME=\$NETBIOSNAME\" && bash'");
next; next;
} }
# $target->setup_env($envname); # $target->setup_env($envname, "$prefix/$envname", $socket_wrapper_dir);
if ($from_build_farm) { if ($from_build_farm) {
run_test_buildfarm($name, $cmd, $i, $suitestotal); run_test_buildfarm($name, $cmd, $i, $suitestotal);

1
source/script/tests/tests_quick.sh
View File

@ -7,4 +7,3 @@ $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_nbt.sh $SERVER $USERNAME $PASSWORD $SRCDIR/script/tests/test_nbt.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD ""
$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN $SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN
#$SRCDIR/script/tests/test_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?`