r22077: Import only necessary test variables, more refactoring.

(This used to be commit 150bb2238ea91ead3bdde0a34ff801b79bc83ec3)

diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c
index e4063bc15bbde2959bbf653c7dd418c0ceeddb7f..2f2d406cbdfcd0a0c54811bc965b301f07041514 100644 (file)
--- a/source4/rpc_server/epmapper/rpc_epmapper.c
+++ b/source4/rpc_server/epmapper/rpc_epmapper.c
@@ -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, 
-                                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);
 }

diff --git a/source4/script/tests/SocketWrapper.pm b/source4/script/tests/SocketWrapper.pm
index d01aba829e5da2f4af334103773293e54d2100f0..9f6c879663ea61cf882760b1d5768ad5955eb161 100644 (file)
--- a/source4/script/tests/SocketWrapper.pm
+++ b/source4/script/tests/SocketWrapper.pm
@@ -31,6 +31,7 @@ sub setup_pcap($)
 {
        my ($pcap_file) = @_;
 
+       $ENV{SOCKET_WRAPPER_PCAP_FILE} = $pcap_file;
 }
 
 sub set_default_iface($)

diff --git a/source4/script/tests/mktestdc.sh b/source4/script/tests/mktestdc.sh
index 70c4b43f1a98620b0032078ed30d33e2a4fcbd82..3c5cc58353b8a38beaddbddb52a2f6c33cd9f667 100755 (executable)
--- a/source4/script/tests/mktestdc.sh
+++ b/source4/script/tests/mktestdc.sh
@@ -300,7 +300,6 @@ echo "BASEDN=$BASEDN"
 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"

diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 52311347fe92416dfa09433276a9a4245ac86776..247cd0b34690797d45f8c80e877a73f9cb9cf922 100755 (executable)
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -387,14 +387,13 @@ $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";
 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 @@ if (defined($opt_skip)) {
 
 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 @@ NETBIOSNAME=\$NETBIOSNAME\" && bash'");
                        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);

diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
index 703f9dc2945164c0c619738722f7595102971f9a..f66b035e7ecbf13e1af52fc958de827797a0e96c 100755 (executable)
--- a/source4/script/tests/tests_quick.sh
+++ b/source4/script/tests/tests_quick.sh
@@ -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_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 + $?`