summaryrefslogtreecommitdiff
path: root/source4/selftest/env/Samba4.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-08 12:57:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:57 -0500
commitffc9f2e05de1e350790739ad12dc977318b5b5c0 (patch)
tree2fed4326fcba8fad1f72637c2863f7c5560b6728 /source4/selftest/env/Samba4.pm
parentf7c3cd1350a40efbac362f72fe2d9dcde1bce7ad (diff)
downloadsamba-ffc9f2e05de1e350790739ad12dc977318b5b5c0.tar.gz
samba-ffc9f2e05de1e350790739ad12dc977318b5b5c0.tar.bz2
samba-ffc9f2e05de1e350790739ad12dc977318b5b5c0.zip
r25574: Support SMBD_OPTIONS, NMBD_OPTIONS and WINBINDD_OPTIONS environment variables for make test.
(This used to be commit 814027146d9a4d309808bda635d5bc8d34974045)
Diffstat (limited to 'source4/selftest/env/Samba4.pm')
-rw-r--r--source4/selftest/env/Samba4.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index a8c2490483..944ed83d58 100644
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -104,6 +104,9 @@ sub check_or_start($$$)
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";