diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-30 18:29:58 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-01 02:05:36 +0200 |
| commit | 8309e3f6050b7a438ba880c9b4ab6653488f1134 (patch) | |
| tree | 6da69c3d0459ce12174902b738791251dc57c7b6 /source4/selftest | |
| parent | 1611499ec6480b073c4025f2bc78e430a6f2308e (diff) | |
| download | samba-8309e3f6050b7a438ba880c9b4ab6653488f1134.tar.gz samba-8309e3f6050b7a438ba880c9b4ab6653488f1134.tar.bz2 samba-8309e3f6050b7a438ba880c9b4ab6653488f1134.zip | |
s4-selftest: Normalize paths.
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 727b32e86d..6c0d84196e 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -126,9 +126,9 @@ def plansmbtorturetestsuite(name, env, options): plantestsuite_loadlist(modname, env, cmdline) -samba4srcdir = os.path.join(os.path.dirname(__file__), "..") +samba4srcdir = os.path.normpath(os.path.join(os.path.dirname(__file__), "..")) builddir = os.getenv("BUILDDIR", samba4srcdir) -samba4bindir = os.path.join(builddir, "bin") +samba4bindir = os.path.normpath(os.path.join(builddir, "bin")) smb4torture = binpath("smbtorture") smb4torture_testsuite_list = subprocess.Popen([smb4torture, "--list"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines() validate = os.getenv("VALIDATE", "") @@ -346,8 +346,8 @@ plansmbtorturetestsuite("DRS-UNIT", "none", "ncalrpc:") # Pidl tests for f in sorted(os.listdir(os.path.join(samba4srcdir, "../pidl/tests"))): if f.endswith(".pl"): - planperltestsuite("pidl.%s" % f[:-3], os.path.join(samba4srcdir, "../pidl/tests", f)) -planperltestsuite("selftest.samba4", os.path.join(samba4srcdir, "../selftest/test_samba4.pl")) + planperltestsuite("pidl.%s" % f[:-3], os.path.normpath(os.path.join(samba4srcdir, "../pidl/tests", f))) +planperltestsuite("selftest.samba4", os.path.normpath(os.path.join(samba4srcdir, "../selftest/test_samba4.pl"))) # Blackbox Tests: # tests that interact directly with the command-line tools rather than using @@ -486,7 +486,7 @@ plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:.. plantestsuite("samba4.policy.python", "none", ['PYTHONPATH="$PYTHONPATH:lib/policy/tests/python"', subunitrun, 'bindings']) plantestsuite("samba4.blackbox.samba3dump", "none", [python, os.path.join(samba4srcdir, "scripting/bin/samba3dump"), os.path.join(samba4srcdir, "../testdata/samba3")]) os.system("rm -rf $PREFIX/upgrade") -plantestsuite("samba4.blackbox.upgrade", "none", [python, os.path.join(samba4srcdir, "setup/upgrade_from_s3"), "--targetdir=$PREFIX/upgrade", os.path.join(samba4srcdir, "../testdata/samba3"), os.path.join(samba4srcdir, "../testdata/samba3/smb.conf")]) +plantestsuite("samba4.blackbox.upgrade", "none", [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"))]) os.system("rm -rf $PREFIX/provision") # FIXME os.system("mkdir $PREFIX/provision") # FIXME plantestsuite("samba4.blackbox.provision.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision.sh"), '$PREFIX/provision']) |