diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-12 03:54:53 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-12 03:54:53 +0200 |
| commit | 4accab35c66cbca5691e81d50215a48f25a8be30 (patch) | |
| tree | cbd875aff67cf4889ef76091c1a13b760a5e912c /source4/selftest | |
| parent | 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff) | |
| parent | 826dadf4f24765cdd437c29c035496ae6793761c (diff) | |
| download | samba-4accab35c66cbca5691e81d50215a48f25a8be30.tar.gz samba-4accab35c66cbca5691e81d50215a48f25a8be30.tar.bz2 samba-4accab35c66cbca5691e81d50215a48f25a8be30.zip | |
Merge branch 'nosmbpython' into v4-0-test
(This used to be commit 9683f7434c7ea01631d8adae9d43274c77ff51de)
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 | ||||
| -rw-r--r-- | source4/selftest/target/Samba4.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 9c7e93906c..5a9cdafe3b 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)); |