sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Use system python rather than smbpython.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-05-11 05:29:20 +02:00
parent 371afde9b0
commit d3df51cd01
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/ldb/tests/python/ldap.py
View File

@ -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

4
source/scripting/bin/subunitrun
View File

@ -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

2
source/selftest/samba4_tests.sh
View File

@ -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

2
source/selftest/target/Samba4.pm
View File

@ -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));

2
source/setup/provision
View File

@ -26,6 +26,8 @@ import getopt
import optparse
import os, sys
sys.path.append("bin/python")
import samba
import param