diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-19 11:40:25 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-05-19 11:40:25 +1000 |
| commit | 03eb236f20e6efef9993e8beabfbae16787f32fb (patch) | |
| tree | 40de32d36e412da0f028cc2822f47555ff8d0ffc /source4/selftest | |
| parent | 66cbf7eb59ab4a29dca1d30850c9aeb35a598b3d (diff) | |
| parent | 022ab33222539276272b7399a5df310e1c548ca0 (diff) | |
| download | samba-03eb236f20e6efef9993e8beabfbae16787f32fb.tar.gz samba-03eb236f20e6efef9993e8beabfbae16787f32fb.tar.bz2 samba-03eb236f20e6efef9993e8beabfbae16787f32fb.zip | |
Merge commit 'origin/v4-0-test' into vfs_smb2
(This used to be commit 733937e87a1adcc19492ea2bd138e705701901b6)
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)); |