diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-31 11:58:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-31 11:58:37 +1100 |
| commit | 631e688c821b78d09d77f5940074800525c554aa (patch) | |
| tree | 74473f1727ea0afa27d9c15e50e4638c4d8faf28 /selftest/target/Samba4.pm | |
| parent | 13be4d7ff42bd2b8bf5702a499c482404e5cd164 (diff) | |
| parent | 4b8e4ea7286f045effb6feb4c7bf8c5ef4ed2f9b (diff) | |
| download | samba-631e688c821b78d09d77f5940074800525c554aa.tar.gz samba-631e688c821b78d09d77f5940074800525c554aa.tar.bz2 samba-631e688c821b78d09d77f5940074800525c554aa.zip | |
Merge branch 'master' into wspp-schema
Diffstat (limited to 'selftest/target/Samba4.pm')
| -rw-r--r-- | selftest/target/Samba4.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 71dddf6939..1058ac66e0 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -103,8 +103,8 @@ sub check_or_start($$$) SocketWrapper::set_default_iface($env_vars->{SOCKET_WRAPPER_DEFAULT_IFACE}); my $valgrind = ""; - if (defined($ENV{SMBD_VALGRIND})) { - $valgrind = $ENV{SMBD_VALGRIND}; + if (defined($ENV{SAMBA_VALGRIND})) { + $valgrind = $ENV{SAMBA_VALGRIND}; } $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG}; @@ -122,8 +122,8 @@ sub check_or_start($$$) if (defined($max_time)) { $optarg = "--maximum-runtime=$max_time "; } - if (defined($ENV{SMBD_OPTIONS})) { - $optarg.= " $ENV{SMBD_OPTIONS}"; + if (defined($ENV{SAMBA_OPTIONS})) { + $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"); |