summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-11 05:29:20 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-11 05:29:20 +0200
commitbabdcc6135e6d3a91a9ddeae0555652026f09344 (patch)
treeffcd95daa640fd69675891ab02cfa88a6b21a9a4
parent67914192c29a0abe98b264c3c9aba8bdb2cae437 (diff)
downloadsamba-babdcc6135e6d3a91a9ddeae0555652026f09344.tar.gz
samba-babdcc6135e6d3a91a9ddeae0555652026f09344.tar.bz2
samba-babdcc6135e6d3a91a9ddeae0555652026f09344.zip
Use system python rather than smbpython.
(This used to be commit d3df51cd01e53383dcc05923d248db03bc6f62e9)
-rwxr-xr-xsource4/lib/ldb/tests/python/ldap.py2
-rwxr-xr-xsource4/scripting/bin/subunitrun4
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
-rw-r--r--source4/selftest/target/Samba4.pm2
-rwxr-xr-xsource4/setup/provision2
5 files changed, 9 insertions, 3 deletions
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index ead5796b7b..7cbe6e5e7d 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -6,6 +6,8 @@ import getopt
import optparse
import sys
+sys.path.append("bin/python")
+
import samba.getopt as options
from auth import system_session
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index fbbffde42c..719a58d9e5 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -17,8 +17,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from subunit import SubunitTestRunner
import sys
+sys.path.append("bin/python")
+
+from subunit import SubunitTestRunner
from unittest import TestProgram
import optparse
import os
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 725fde2c7d..287274f669 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -328,7 +328,7 @@ then
plantest "nss.test using winbind" member $VALGRIND $samba4bindir/nsstest $samba4bindir/shared/libnss_winbind.so
fi
-PYTHON=bin/smbpython
+PYTHON=/usr/bin/python
SUBUNITRUN="$PYTHON ./scripting/bin/subunitrun"
plantest "ldb.python" none PYTHONPATH="$PYTHONPATH:lib/ldb/tests/python/" $SUBUNITRUN api
plantest "credentials.python" none PYTHONPATH="$PYTHONPATH:auth/credentials/tests" $SUBUNITRUN bindings
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 9488ae3e04..a12939b0a1 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -705,7 +705,7 @@ nogroup:x:65534:nobody
push (@provision_options, "$self->{bindir}/smbscript");
push (@provision_options, "$self->{setupdir}/provision.js");
} else {
- push (@provision_options, "$self->{bindir}/smbpython");
+# push (@provision_options, "$self->{bindir}/smbpython");
push (@provision_options, "$self->{setupdir}/provision");
}
push (@provision_options, split(' ', $configuration));
diff --git a/source4/setup/provision b/source4/setup/provision
index b748dab339..ad289aaaa3 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -26,6 +26,8 @@ import getopt
import optparse
import os, sys
+sys.path.append("bin/python")
+
import samba
import param