diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 17:36:36 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:01 +1100 |
| commit | be5a709341df751df85f216bf026bb576eb92298 (patch) | |
| tree | dda0699dd1f1c195db36800c049728849ffad3e5 | |
| parent | 677f28d8b2d7324817ced7eb5e03343208b6ac86 (diff) | |
| download | samba-be5a709341df751df85f216bf026bb576eb92298.tar.gz samba-be5a709341df751df85f216bf026bb576eb92298.tar.bz2 samba-be5a709341df751df85f216bf026bb576eb92298.zip | |
s4-test: fixed hard coded test paths for top level build
this fixes the various test plans that hard coded incorrect paths for
a top level build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rwxr-xr-x | source4/selftest/tests.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 047d75a8b0..4306c1de74 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -476,11 +476,11 @@ def plansambapythontestsuite(name, env, path, module, environ={}, extra_args=[]) plantestsuite(name, env, args) -plansambapythontestsuite("ldb.python", "none", "./lib/ldb/tests/python/", 'api') +plansambapythontestsuite("ldb.python", "none", "%s/lib/ldb/tests/python/" % samba4srcdir, 'api') planpythontestsuite("none", "samba.tests.credentials") plantestsuite_idlist("samba.tests.gensec", "dc:local", [subunitrun, "$LISTOPT", '-U"$USERNAME%$PASSWORD"', "samba.tests.gensec"]) planpythontestsuite("none", "samba.tests.registry") -plansambapythontestsuite("tdb.python", "none", "../lib/tdb/python/tests", 'simple') +plansambapythontestsuite("tdb.python", "none", "%s/lib/tdb/python/tests" % srcdir, 'simple') planpythontestsuite("none", "samba.tests.auth") planpythontestsuite("none", "samba.tests.security") planpythontestsuite("none", "samba.tests.dcerpc.misc") @@ -521,7 +521,9 @@ planpythontestsuite("dc:local", "samba.tests.upgradeprovisionneeddc") planpythontestsuite("none", "samba.tests.upgradeprovision") planpythontestsuite("none", "samba.tests.xattr") planpythontestsuite("none", "samba.tests.ntacls") -plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:../lib/subunit/python:../lib/testtools"', python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN']) +plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir, srcdir), + python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"), + '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN']) plansambapythontestsuite("samba4.policy.python", "none", "lib/policy/tests/python", 'bindings') plantestsuite("samba4.blackbox.samba3dump", "none", [python, os.path.join(samba4srcdir, "scripting/bin/samba3dump"), os.path.join(samba4srcdir, "../testdata/samba3")], allow_empty_output=True) plantestsuite("samba4.blackbox.upgrade", "none", ["rm -rf $PREFIX/upgrade;", python, os.path.join(samba4srcdir, "setup/upgrade_from_s3"), "--targetdir=$PREFIX/upgrade", os.path.normpath(os.path.join(samba4srcdir, "../testdata/samba3")), os.path.normpath(os.path.join(samba4srcdir, "../testdata/samba3/smb.conf"))], allow_empty_output=True) |