[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-268-g40b67c3

[Stefan Metzmacher]

The branch, master has been updated
       via  40b67c3426042ea46d2497e459807ef9551e62f1 (commit)
      from  c96534cd6e3eb3bef88ee538838519437870a085 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 40b67c3426042ea46d2497e459807ef9551e62f1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 20:38:27 2009 +0100

    selftest: pass down the path to python for provisioning samba4
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba4.pm  |    3 +++
 source4/selftest/config.mk |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 208824d..5ca1a6a 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -717,6 +717,9 @@ nogroup:x:65534:nobody
 	if (defined($ENV{VALGRIND_PROVISION})) {
 		push (@provision_options, "valgrind");
 	}
+	if (defined($ENV{PYTHON})) {
+		push (@provision_options, $ENV{PYTHON});
+	}
 	push (@provision_options, "$self->{setupdir}/provision");
 	push (@provision_options, split(' ', $configuration));
 	push (@provision_options, "--host-name=$netbiosname");
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index c5f7c5a..324532c 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -1,6 +1,7 @@
 TEST_FORMAT = plain
 
-SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
+SELFTEST = $(LD_LIBPATH_OVERRIDE) PYTHON=$(PYTHON) \
+    $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
     --builddir=$(builddir) --srcdir=$(srcdir) \
     --expected-failures=$(srcdir)/selftest/knownfail \
 	--format=$(TEST_FORMAT) \


-- 
Samba Shared Repository