diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-10 17:48:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-10 17:48:52 +0100 |
| commit | 24da29746998de1001d18871dcbe8d37643667d5 (patch) | |
| tree | 2d0c54feca7d2ee4d7c5fa9b51ddc9540a821bab | |
| parent | 48c75bade7fe68f3fcaf075a97bcdb80b448bbb7 (diff) | |
| download | samba-24da29746998de1001d18871dcbe8d37643667d5.tar.gz samba-24da29746998de1001d18871dcbe8d37643667d5.tar.bz2 samba-24da29746998de1001d18871dcbe8d37643667d5.zip | |
selftest: Use Python provision for Samba 4 by default.
(This used to be commit 12cf633f7f28f5cefb0cdd90ee9f2e6b77bb3aa3)
| -rw-r--r-- | source4/selftest/env/Samba4.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm index 61edeb3885..aacf3c3802 100644 --- a/source4/selftest/env/Samba4.pm +++ b/source4/selftest/env/Samba4.pm @@ -654,12 +654,12 @@ nogroup:x:65534:nobody my @provision_options = (); push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\""); push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\""); - if (defined($ENV{PROVISION_PYTHON})) { - push (@provision_options, "$self->{bindir}/smbpython"); - push (@provision_options, "$self->{setupdir}/provision.py"); - } else { + if (defined($ENV{PROVISION_EJS})) { push (@provision_options, "$self->{bindir}/smbscript"); push (@provision_options, "$self->{setupdir}/provision"); + } else { + push (@provision_options, "$self->{bindir}/smbpython"); + push (@provision_options, "$self->{setupdir}/provision.py"); } push (@provision_options, split(' ', $configuration)); push (@provision_options, "--host-name=$netbiosname"); |