Rev 11329: Fix all tests except for the Kerberos ones. in file:///home/jelmer/bzr.samba/4.0-perlselftest/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/4.0-perlselftest/

------------------------------------------------------------
revno: 11329
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 4.0-perlselftest
timestamp: Mon 2007-03-05 20:25:06 +0100
message:
  Fix all tests except for the Kerberos ones.
modified:
  source/librpc/idl/winreg.idl   svn-v2:[EMAIL PROTECTED]
  source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED]
=== modified file 'source/librpc/idl/winreg.idl'
--- a/source/librpc/idl/winreg.idl      2007-02-21 11:54:30 +0000
+++ b/source/librpc/idl/winreg.idl      2007-03-05 19:25:06 +0000
@@ -165,7 +165,7 @@
                [in,ref]        policy_handle *handle,
                [in]            uint32 enum_index,
                [in,out,ref]    winreg_StringBuf *name,
-               [in,out,ref] winreg_Type **type,
+               [in,out,unique] winreg_Type *type,
                [in,out,unique,size_is(*size),length_is(*length)] uint8 *value,
                [in,out,unique] uint32 *size,
                [in,out,unique] uint32 *length

=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl   2007-03-05 14:33:53 +0000
+++ b/source/script/tests/selftest.pl   2007-03-05 19:25:06 +0000
@@ -384,6 +384,8 @@
        die("unknown target `$opt_target'");
 }
 
+foreach (keys %$testenv_vars) { $ENV{$_} = $testenv_vars->{$_}; }
+
 if ($opt_socket_wrapper_pcap) {
        $ENV{SOCKET_WRAPPER_PCAP_FILE} = $opt_socket_wrapper_pcap;
        # Socket wrapper pcap implies socket wrapper
@@ -428,7 +430,7 @@
        $max_time = $ENV{SMBD_MAX_TIME};
 }
 Samba4::smbd_check_or_start($bindir, $test_fifo, $ENV{SMBD_TEST_LOG}, 
-                       $socket_wrapper_dir, $max_time, 
$testenv_vars->{CONFFILE});
+                       $socket_wrapper_dir, $max_time, $ENV{CONFFILE});
 
 SocketWrapper::set_default_iface(6);
 
@@ -440,7 +442,7 @@
                                                 "127.0.0.11/8"));
 
 push (@torture_options, "--option=interfaces=$interfaces");
-push (@torture_options, $testenv_vars->{CONFIGURATION});
+push (@torture_options, $ENV{CONFIGURATION});
 # ensure any one smbtorture call doesn't run too long
 push (@torture_options, "--maximum-runtime=$torture_maxtime");
 push (@torture_options, "--target=$opt_target");
@@ -455,10 +457,6 @@
 
 my @todo = ();
 
-my %OLDENV = %ENV;
-
-foreach (keys %$testenv_vars) { $ENV{$_} = $testenv_vars->{$_}; }
-
 if ($opt_target eq "win") {
        system("$testsdir/test_win.sh");
 } else { 
@@ -484,13 +482,6 @@
 
 Samba4::wait_for_start();
 
-%ENV = %OLDENV;
-
-foreach (qw(KRB5_CONFIG PREFIX_ABS TEST_DATA_PREFIX CONFIGURATION CONFFILE
-PIDDIR AUTH SERVER NETBIOSNAME)) {
-       $ENV{$_} = $testenv_vars->{$_};
-}
-
 # start off with 0 failures
 $ENV{failed} = 0;