Use system python rather than smbpython.

diff --git a/source/lib/ldb/tests/python/ldap.py b/source/lib/ldb/tests/python/ldap.py
index ead5796b7b6ca9839606f4a857ea24d4da7f3c73..7cbe6e5e7d5620a76fbd4c562e4e81026f092232 100755 (executable)
--- a/source/lib/ldb/tests/python/ldap.py
+++ b/source/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/source/scripting/bin/subunitrun b/source/scripting/bin/subunitrun
index fbbffde42cd5840473c0307a6bbe3d4c6a9f5155..719a58d9e503ea13b5e689ca5d0e26c0e176210b 100755 (executable)
--- a/source/scripting/bin/subunitrun
+++ b/source/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/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 725fde2c7d45c68ccd48c133829a38f4a537bf9b..287274f66943366e8bdd43ebca4bd81e66e32f6c 100755 (executable)
--- a/source/selftest/samba4_tests.sh
+++ b/source/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/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 9488ae3e0404ad63cad0ec84489978419577b414..a12939b0a173e74f1fc19e90090b9b5b3e24f15a 100644 (file)
--- a/source/selftest/target/Samba4.pm
+++ b/source/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/source/setup/provision b/source/setup/provision
index b748dab33998cd49dd66ec8579c598ac09bc9032..ad289aaaa31485e20ac83ad968ced120e92a989b 100755 (executable)
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -26,6 +26,8 @@ import getopt
 import optparse
 import os, sys
 
+sys.path.append("bin/python")
+
 import samba
 import param