From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 12 Aug 2009 04:41:44 +0000 (+1000)
Subject: Allow selection of the samba4 process model for 'make test'
X-Git-Tag: talloc-2.0.0~425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad542a630eb2ee265d626b9752f0197281c51990;p=thirdparty%2Fsamba.git

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.
---

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 81ad09dbc00..ef553231a09 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -123,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;