[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-946-g3b5c6bc

[Andrew Tridgell]

The branch, master has been updated
       via  3b5c6bc971c4e5c32b19072f0f54258792d00439 (commit)
       via  c6936ab00f22c87d8ef8590578056446055d37a2 (commit)
       via  ad542a630eb2ee265d626b9752f0197281c51990 (commit)
       via  0ae3912f328250703e921ec78eb9add98cbfcf7c (commit)
      from  7bc566a88277ecbc0f712b7c54116163930f187d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3b5c6bc971c4e5c32b19072f0f54258792d00439
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Aug 12 15:20:02 2009 +1000

    no need to shout about getting an oplock

commit c6936ab00f22c87d8ef8590578056446055d37a2
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Aug 12 15:19:42 2009 +1000

    raise the debug level for a common message
    
    when a client disconnects we expect this to happen, so don't print an
    error each time

commit ad542a630eb2ee265d626b9752f0197281c51990
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Aug 12 14:41:44 2009 +1000

    Allow selection of the samba4 process model for 'make test'
    
    To choose the process model, set the environment variable
    SAMBA_PROCESS_MODEL to the desired model. This will allow us to enable
    the standard process model for some machines in the build farm without
    enabling it for all of them. I don't want to just enable it
    universally as I am concerned with total memory using during some of
    the tests.

commit 0ae3912f328250703e921ec78eb9add98cbfcf7c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Aug 12 14:38:55 2009 +1000

    print server log on stderr as well as to log file
    
    I think we are missing some important messages from the server during
    'make test' because we don't show the log file contents during
    runs. This patch uses tee to put the log messages to stderr so we can
    see any server messages associated with the test that caused them.

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba4.pm         |   18 +++++++++++++++---
 source4/lib/tls/tls.c             |    2 +-
 source4/ntvfs/posix/pvfs_oplock.c |    2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 0f909ce..ef55323 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -88,9 +88,12 @@ sub check_or_start($$$)
 	my $pid = fork();
 	if ($pid == 0) {
 		open STDIN, $env_vars->{SAMBA_TEST_FIFO};
-		open STDOUT, ">$env_vars->{SAMBA_TEST_LOG}";
+		# we want out from samba to go to the log file, but also
+		# to the users terminal when running 'make test' on the command
+		# line. This puts it on stderr on the terminal
+		open STDOUT, "| tee $env_vars->{SAMBA_TEST_LOG} 1>&2";
 		open STDERR, '>&STDOUT';
-		
+
 		SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE});
 
 		my $valgrind = "";
@@ -120,7 +123,16 @@ sub check_or_start($$$)
 			$optarg.= " $ENV{SAMBA_OPTIONS}";
 		}
 		my $samba = $self->bindir_path("samba");
-		my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
+
+		# allow selection of the process model using
+		# the environment varibale SAMBA_PROCESS_MODEL
+		# that allows us to change the process model for 
+		# individual machines in the build farm
+		my $model = "single";
+		if (defined($ENV{SAMBA_PROCESS_MODEL})) {
+			$model = $ENV{SAMBA_PROCESS_MODEL};
+		}
+		my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M $model -i");
 		if ($? == -1) {
 			print "Unable to start $samba: $ret: $!\n";
 			exit 1;
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index d4e8680..ba2e9e4 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -185,7 +185,7 @@ static int tls_destructor(struct tls_context *tls)
 	int ret;
 	ret = gnutls_bye(tls->session, GNUTLS_SHUT_WR);
 	if (ret < 0) {
-		DEBUG(0,("TLS gnutls_bye failed - %s\n", gnutls_strerror(ret)));
+		DEBUG(4,("TLS gnutls_bye failed - %s\n", gnutls_strerror(ret)));
 	}
 	return 0;
 }
diff --git a/source4/ntvfs/posix/pvfs_oplock.c b/source4/ntvfs/posix/pvfs_oplock.c
index e5a069a..a10188f 100644
--- a/source4/ntvfs/posix/pvfs_oplock.c
+++ b/source4/ntvfs/posix/pvfs_oplock.c
@@ -122,7 +122,7 @@ static void pvfs_oplock_break(struct pvfs_oplock *opl, uint8_t level)
 		 */
 		*last = cur;
 
-		DEBUG(0,("%s: sending oplock break level %d for '%s' %p\n",
+		DEBUG(5,("%s: sending oplock break level %d for '%s' %p\n",
 			__FUNCTION__, level, h->name->original_name, h));
 		status = ntvfs_send_oplock_break(pvfs->ntvfs, f->ntvfs, level);
 		if (!NT_STATUS_IS_OK(status)) {


-- 
Samba Shared Repository