diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-08-12 14:41:44 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-08-12 14:41:44 +1000 |
commit | ad542a630eb2ee265d626b9752f0197281c51990 (patch) | |
tree | 22bd61250cb35c0a3848ba032bc5ac572183c1bc /selftest | |
parent | 0ae3912f328250703e921ec78eb9add98cbfcf7c (diff) | |
download | samba-ad542a630eb2ee265d626b9752f0197281c51990.tar.gz samba-ad542a630eb2ee265d626b9752f0197281c51990.tar.bz2 samba-ad542a630eb2ee265d626b9752f0197281c51990.zip |
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.
Diffstat (limited to 'selftest')
-rw-r--r-- | selftest/target/Samba4.pm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 81ad09dbc0..ef553231a0 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; |