svn commit: samba r22077 - in branches/SAMBA_4_0: .
source/rpc_server/epmapper source/script/tests
jelmer at samba.org
jelmer at samba.org
Wed Apr 4 14:24:44 GMT 2007
Author: jelmer
Date: 2007-04-04 14:24:44 +0000 (Wed, 04 Apr 2007)
New Revision: 22077
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22077
Log:
Import only necessary test variables, more refactoring.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm
branches/SAMBA_4_0/source/script/tests/mktestdc.sh
branches/SAMBA_4_0/source/script/tests/selftest.pl
branches/SAMBA_4_0/source/script/tests/tests_quick.sh
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
...skipped...
Modified: branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c 2007-04-04 12:40:19 UTC (rev 22076)
+++ branches/SAMBA_4_0/source/rpc_server/epmapper/rpc_epmapper.c 2007-04-04 14:24:44 UTC (rev 22077)
@@ -80,8 +80,7 @@
}
-static error_status_t dcesrv_epm_Insert(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
- struct epm_Insert *r)
+static error_status_t dcesrv_epm_Insert(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct epm_Insert *r)
{
DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
}
Modified: branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm 2007-04-04 12:40:19 UTC (rev 22076)
+++ branches/SAMBA_4_0/source/script/tests/SocketWrapper.pm 2007-04-04 14:24:44 UTC (rev 22077)
@@ -31,6 +31,7 @@
{
my ($pcap_file) = @_;
+ $ENV{SOCKET_WRAPPER_PCAP_FILE} = $pcap_file;
}
sub set_default_iface($)
Modified: branches/SAMBA_4_0/source/script/tests/mktestdc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mktestdc.sh 2007-04-04 12:40:19 UTC (rev 22076)
+++ branches/SAMBA_4_0/source/script/tests/mktestdc.sh 2007-04-04 14:24:44 UTC (rev 22077)
@@ -300,7 +300,6 @@
echo "PASSWORD=$PASSWORD"
echo "SRCDIR=$SRCDIR"
echo "PREFIX=$PREFIX"
-echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
echo "LDAPDIR=$LDAPDIR"
echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
echo "PROVISION_ACI=$PROVISION_ACI"
Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-04-04 12:40:19 UTC (rev 22076)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-04-04 14:24:44 UTC (rev 22077)
@@ -387,14 +387,13 @@
my @torture_options = ();
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
$opt_socket_wrapper = 1;
}
my $socket_wrapper_dir;
-if ($opt_socket_wrapper)
-{
+if ($opt_socket_wrapper) {
$socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w");
print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
} else {
@@ -433,10 +432,13 @@
my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir);
-foreach (keys %$testenv_vars) { $ENV{$_} = $testenv_vars->{$_}; }
-
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",
"127.0.0.7/8",
"127.0.0.8/8",
@@ -514,7 +516,7 @@
next;
}
- # $target->setup_env($envname);
+ # $target->setup_env($envname, "$prefix/$envname", $socket_wrapper_dir);
if ($from_build_farm) {
run_test_buildfarm($name, $cmd, $i, $suitestotal);
Modified: branches/SAMBA_4_0/source/script/tests/tests_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2007-04-04 12:40:19 UTC (rev 22076)
+++ branches/SAMBA_4_0/source/script/tests/tests_quick.sh 2007-04-04 14:24:44 UTC (rev 22077)
@@ -7,4 +7,3 @@
$SRCDIR/script/tests/test_nbt.sh $SERVER $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_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?`
More information about the samba-cvs
mailing list