summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-10-27 05:23:57 -0800
committerJelmer Vernooij <jelmer@samba.org>2012-10-27 07:01:10 -0800
commit66980989e5b28490cd7b04b576cf39d26f183b90 (patch)
treee1033b7f9339ebefb31c2d7b745d723be19c7f98
parent13269923585888912e2433c15c0ca010a9897595 (diff)
downloadsamba-66980989e5b28490cd7b04b576cf39d26f183b90.tar.gz
samba-66980989e5b28490cd7b04b576cf39d26f183b90.tar.bz2
samba-66980989e5b28490cd7b04b576cf39d26f183b90.zip
source3.selftest: Move more variables to be in common.
-rw-r--r--selftest/selftesthelpers.py10
-rwxr-xr-xsource3/selftest/tests.py7
2 files changed, 11 insertions, 6 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 8d36356293..34d0e07282 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -29,6 +29,9 @@ def srcdir():
def source4dir():
return os.path.normpath(os.path.join(srcdir(), "source4"))
+def source3dir():
+ return os.path.normpath(os.path.join(srcdir(), "source3"))
+
def bindir():
return os.path.normpath(os.getenv("BINDIR", "./bin"))
@@ -192,6 +195,7 @@ def get_env_torture_options():
samba4srcdir = source4dir()
+samba3srcdir = source3dir()
bbdir = os.path.join(srcdir(), "testprogs/blackbox")
configuration = "--configfile=$SMB_CONF_PATH"
@@ -233,3 +237,9 @@ def plansmbtorture4testsuite(name, env, options, target, modname=None):
def smbtorture4_testsuites(prefix):
return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
+
+
+smbclient3 = binpath('smbclient3')
+smbtorture3 = binpath('smbtorture3')
+ntlm_auth3 = binpath('ntlm_auth3')
+net = binpath('net')
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 777a882033..a45ccaebc5 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -22,14 +22,9 @@ import os, sys
sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "../../selftest")))
import selftesthelpers
from selftesthelpers import *
-samba3srcdir = srcdir() + "/source3"
scriptdir = os.path.join(samba3srcdir, "../script/tests")
-smbclient3 = binpath('smbclient3')
wbinfo = binpath('wbinfo')
-net = binpath('net')
-smbtorture3 = binpath('smbtorture3')
-ntlm_auth3 = binpath('ntlm_auth3')
dbwrap_tool = binpath('dbwrap_tool')
vfstest = binpath('vfstest')
@@ -218,7 +213,7 @@ plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local",
scriptdir, "$SMB_CONF_PATH", net, configuration])
plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"),
- scriptdir, "$SMB_CONF_PATH", net, configuration,dbwrap_tool])
+ scriptdir, "$SMB_CONF_PATH", net, configuration, dbwrap_tool])
plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc",
[os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc'])