summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-29 01:36:41 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:46:43 +0100
commit26ae331f75317bfc0a4787d3960a861b25225615 (patch)
tree62679be62c19b9b24f97f5e3a0c9c4f190ae0043 /source4/selftest
parent902b1935bb5655dc9340747ddf8a0e70de231882 (diff)
downloadsamba-26ae331f75317bfc0a4787d3960a861b25225615.tar.gz
samba-26ae331f75317bfc0a4787d3960a861b25225615.tar.bz2
samba-26ae331f75317bfc0a4787d3960a861b25225615.zip
r26191: Import custom test runner for subunit, rather than using trial, which is part of twisted.
(This used to be commit b0f808345f948c49ad46f34ba306ca8354393850)
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/samba4_tests.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 67d2e69a12..ac8f4dd95f 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -291,12 +291,12 @@ then
plantest "NSS-TEST using winbind" member $VALGRIND $samba4bindir/nsstest $samba4bindir/shared/libnss_winbind.so
fi
-# if trial is available, run the python tests:
-if which trial 2>/dev/null >/dev/null
+# if python is available, run the python tests:
+if which python 2>/dev/null >/dev/null
then
- plantest "ldb.python" none PYTHONPATH=bin/python trial lib/ldb/tests/python/api.py
- plantest "credentials.python" none PYTHONPATH=bin/python trial auth/credentials/tests/bindings.py
- plantest "registry.python" none PYTHONPATH=bin/python trial lib/registry/tests/bindings.py
- plantest "tdb.python" none PYTHONPATH=bin/python trial lib/tdb/python/tests/simple.py
- plantest "auth.python" none PYTHONPATH=bin/python trial auth/tests/bindings.py
+ plantest "ldb.python" none PYTHONPATH=bin/python:scripting/python:lib/ldb/tests/python/ scripting/bin/subunitrun api
+ plantest "credentials.python" none PYTHONPATH=bin/python:scripting/python:auth/credentials/tests scripting/bin/subunitrun bindings
+ plantest "registry.python" none PYTHONPATH=bin/python:scripting/python:lib/registry/tests/ scripting/bin/subunitrun bindings
+ plantest "tdb.python" none PYTHONPATH=bin/python:scripting/python:lib/tdb/python/tests scripting/bin/subunitrun simple
+ plantest "auth.python" none PYTHONPATH=bin/python:scripting/python:auth/tests/ scripting/bin/subunitrun bindings
fi