svn commit: samba r25615 - in branches/SAMBA_4_0: . source/selftest/env

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-10 19:40:19 +0000 (Wed, 10 Oct 2007)
New Revision: 25615

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25615

Log:
Honor SMBD_VALGRIND and NMBD_VALGRIND for Samba3.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/selftest/env/Samba3.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/selftest/env/Samba3.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-10 17:04:00 UTC (rev 25614)
+++ branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-10 19:40:19 UTC (rev 25615)
@@ -168,7 +168,13 @@
 		}
 
 		$ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
-		exec($self->binpath("timelimit"), $nmbd_maxtime, $self->binpath("nmbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
+
+		my @preargs = ($self->binpath("timelimit"), $nmbd_maxtime);
+		if(defined($ENV{NMBD_VALGRIND})) { 
+			@preargs = split(/ /, $ENV{NMBD_VALGRIND});
+		}
+
+		exec(@preargs, $self->binpath("nmbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start nmbd: $!");
 	}
 	write_pid($env_vars, "nmbd", $pid);
 	print "DONE\n";
@@ -189,7 +195,7 @@
 #		}
 #
 #		$ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
-#		exec($self->binpath("timelimit"), $winbindd_maxtime, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
+#		exec($self->binpath("timelimit"), $winbindd_maxtime, $ENV{WINBINDD_VALGRIND}, $self->binpath("winbindd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start winbindd: $!");
 #	}
 #	write_pid($env_vars, "winbindd", $pid);
 #	print "DONE\n";
@@ -208,7 +214,11 @@
 		if (defined($ENV{SMBD_OPTIONS})) {
 			@optargs = split(/ /, $ENV{SMBD_OPTIONS});
 		}
-		exec($self->binpath("timelimit"), $smbd_maxtime, $self->binpath("smbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
+		my @preargs = ($self->binpath("timelimit"), $smbd_maxtime);
+		if(defined($ENV{SMBD_VALGRIND})) {
+			@preargs = split(/ /,$ENV{SMBD_VALGRIND});
+		}
+		exec(@preargs, $self->binpath("smbd"), "-F", "-S", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}, @optargs) or die("Unable to start smbd: $!");
 	}
 	write_pid($env_vars, "smbd", $pid);
 	print "DONE\n";