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

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-08 12:57:30 +0000 (Mon, 08 Oct 2007)
New Revision: 25574

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

Log:
Support SMBD_OPTIONS, NMBD_OPTIONS and WINBINDD_OPTIONS environment variables for make test.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/selftest/env/Samba3.pm
   branches/SAMBA_4_0/source/selftest/env/Samba4.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...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-08 12:56:57 UTC (rev 25573)
+++ branches/SAMBA_4_0/source/selftest/env/Samba3.pm	2007-10-08 12:57:30 UTC (rev 25574)
@@ -162,8 +162,13 @@
 
 		$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
 
+		my @optargs = ("-d0");
+		if (defined($ENV{NMBD_OPTIONS})) {
+			@optargs = split(/ /, $ENV{NMBD_OPTIONS});
+		}
+
 		$ENV{MAKE_TEST_BINARY} = $self->binpath("nmbd");
-		exec($self->binpath("timelimit"), $nmbd_maxtime, $self->binpath("nmbd"), "-F", "-S", "-d0", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start 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: $!");
 	}
 	write_pid($env_vars, "nmbd", $pid);
 	print "DONE\n";
@@ -177,8 +182,13 @@
 
 		$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
 
+		my @optargs = ("-d0");
+		if (defined($ENV{WINBINDD_OPTIONS})) {
+			@optargs = split(/ /, $ENV{WINBINDD_OPTIONS});
+		}
+
 		$ENV{MAKE_TEST_BINARY} = $self->binpath("winbindd");
-		exec($self->binpath("timelimit"), $winbindd_maxtime, $self->binpath("winbindd"), "-F", "-S", "-d0", "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start 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: $!");
 	}
 	write_pid($env_vars, "winbindd", $pid);
 	print "DONE\n";
@@ -193,7 +203,11 @@
 		$ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR};
 
 		$ENV{MAKE_TEST_BINARY} = $self->binpath("smbd");
-		exec($self->binpath("timelimit"), $smbd_maxtime, $self->binpath("smbd"), "-F", "-S", "-d0" , "--no-process-group", "-s", $env_vars->{SERVERCONFFILE}) or die("Unable to start smbd: $!");
+		my @optargs = ("-d0");
+		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: $!");
 	}
 	write_pid($env_vars, "smbd", $pid);
 	print "DONE\n";

Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-10-08 12:56:57 UTC (rev 25573)
+++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm	2007-10-08 12:57:30 UTC (rev 25574)
@@ -104,6 +104,9 @@
 		if (defined($max_time)) {
 			$optarg = "--maximum-runtime=$max_time ";
 		}
+		if (defined($ENV{SMBD_OPTIONS})) {
+			$optarg.= " $ENV{SMBD_OPTIONS}";
+		}
 		my $ret = system("$valgrind $self->{bindir}/smbd $optarg $env_vars->{CONFIGURATION} -M single -i --leak-report-full");
 		if ($? == -1) {
 			print "Unable to start smbd: $ret: $!\n";