diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-04-18 14:02:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:05 -0500 |
| commit | 08a44496d136b3ac184a6584f3ce8f476f545c76 (patch) | |
| tree | e160672551ba8850add54086bdd2b01b6624826e /source4/script/tests/Samba4.pm | |
| parent | 0fe8434b3b4fa0c7c56a6f2e04d3257cd4227e74 (diff) | |
| download | samba-08a44496d136b3ac184a6584f3ce8f476f545c76.tar.gz samba-08a44496d136b3ac184a6584f3ce8f476f545c76.tar.bz2 samba-08a44496d136b3ac184a6584f3ce8f476f545c76.zip | |
r22337: print out the smbd log output after each test
metze
(This used to be commit b6b95180d3fb851264fd64eb5a0de4803ee0892a)
Diffstat (limited to 'source4/script/tests/Samba4.pm')
| -rw-r--r-- | source4/script/tests/Samba4.pm | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm index fe8ed35ca3..d0f66f1a8d 100644 --- a/source4/script/tests/Samba4.pm +++ b/source4/script/tests/Samba4.pm @@ -141,6 +141,8 @@ sub wait_for_start($$) system("bin/nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER} $testenv_vars->{NETBIOSNAME}"); system("bin/nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}"); system("bin/nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER} $testenv_vars->{NETBIOSNAME}"); + + print $self->getlog_env($testenv_vars); } sub write_ldb_file($$$) @@ -596,6 +598,7 @@ sub provision_member($$$) $ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo"; $ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log"; + $ret->{SMBD_TEST_LOG_POS} = 0; return $ret; } @@ -612,6 +615,7 @@ sub provision_dc($$) $ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo"; $ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log"; + $ret->{SMBD_TEST_LOG_POS} = 0; return $ret; } @@ -651,10 +655,30 @@ sub teardown_env($$) return $failed; } +sub getlog_env($$) +{ + my ($self, $envvars) = @_; + my $title = "SMBD LOG of: $envvars->{NETBIOSNAME}\n"; + my $out = $title; + + open(LOG, "<$envvars->{SMBD_TEST_LOG}"); + + seek(LOG, $envvars->{SMBD_TEST_LOG_POS}, SEEK_SET); + while (<LOG>) { + $out .= $_; + } + $envvars->{SMBD_TEST_LOG_POS} = tell(LOG); + close(LOG); + + return "" if $out eq $title; + + return $out; +} + sub setup_env($$$) { my ($self, $envname, $path) = @_; - + if ($envname eq "dc") { return $self->setup_dc("$path/dc"); } elsif ($envname eq "member") { |