diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 08:36:39 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:55 +0100 |
| commit | 09915ce8b7edcf23335d570d70f79797afe83a71 (patch) | |
| tree | ab2cdc82169d6211bdefca79fe2b509750a9447c /source4/selftest/env | |
| parent | 01b96e47cd77c345ac27c4c882e353852e49f22b (diff) | |
| download | samba-09915ce8b7edcf23335d570d70f79797afe83a71.tar.gz samba-09915ce8b7edcf23335d570d70f79797afe83a71.tar.bz2 samba-09915ce8b7edcf23335d570d70f79797afe83a71.zip | |
r26499: Allow testing python provision by setting the PROVISION_PYTHON environment variable.
(This used to be commit 379d0bbb2f9e0cd9b1855fd77bbb89827e0315ad)
Diffstat (limited to 'source4/selftest/env')
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index dbddb25465..f2ba37f618 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/selftest/env/Samba4.pm @@ -628,8 +628,12 @@ nogroup:x:65534:nobody my @provision_options = (); push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\""); push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\""); - push (@provision_options, "$self->{bindir}/smbscript"); - push (@provision_options, "$self->{setupdir}/provision"); + if (defined($ENV{PROVISION_PYTHON})) { + push (@provision_options, "$self->{setupdir}/provision.py"); + } else { + push (@provision_options, "$self->{bindir}/smbscript"); + push (@provision_options, "$self->{setupdir}/provision"); + } push (@provision_options, split(' ', $configuration)); push (@provision_options, "--host-name=$netbiosname"); push (@provision_options, "--host-ip=$ifaceipv4"); |