summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-10-05 11:46:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2012-10-11 18:50:40 +0200
commit1aa291c331c29c2f5ee4572b660c4c2061755856 (patch)
tree0a3b3280712a93d5e56a6987be17e89f9a3d9afb
parent1080b6c2caf1191fd896f3caf38e576a00b01982 (diff)
downloadsamba-1aa291c331c29c2f5ee4572b660c4c2061755856.tar.gz
samba-1aa291c331c29c2f5ee4572b660c4c2061755856.tar.bz2
samba-1aa291c331c29c2f5ee4572b660c4c2061755856.zip
selftest: Move some tests to common test script.
-rw-r--r--selftest/tests.py2
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/selftest/tests.py b/selftest/tests.py
index 91caba4202..d9ad9e9661 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -21,3 +21,5 @@
from selftesthelpers import *
planpythontestsuite("none", "samba.tests.source")
+planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
+planpythontestsuite("none", "subunit")
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 756b28c4e0..d99c4b0513 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -417,7 +417,6 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
name = module
plantestsuite(name, env, args)
-planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
planpythontestsuite("none", "api", name="ldb.python", extra_path=['lib/ldb/tests/python'])
planpythontestsuite("none", "samba.tests.credentials")
planoldpythontestsuite("dc:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'])
@@ -450,7 +449,6 @@ planpythontestsuite("dc:local", "samba.tests.samba_tool.user")
planpythontestsuite("dc:local", "samba.tests.samba_tool.group")
planpythontestsuite("plugin_s4_dc:local", "samba.tests.samba_tool.ntacl")
-planpythontestsuite("none", "subunit")
planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
planoldpythontestsuite("dc:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])