sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-18 06:04:06 +03:00
Code

source3.selftest: Move more variables to be in common.

Browse Source
This commit is contained in:
Jelmer Vernooij 2012-10-27 05:23:57 -08:00
parent 1326992358
commit 66980989e5
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
selftest/selftesthelpers.py
View File

@ -29,6 +29,9 @@ def srcdir():
def source4dir(): def source4dir():
return os.path.normpath(os.path.join(srcdir(), "source4")) return os.path.normpath(os.path.join(srcdir(), "source4"))
def source3dir():
return os.path.normpath(os.path.join(srcdir(), "source3"))
def bindir(): def bindir():
return os.path.normpath(os.getenv("BINDIR", "./bin")) return os.path.normpath(os.getenv("BINDIR", "./bin"))
@ -192,6 +195,7 @@ def get_env_torture_options():
samba4srcdir = source4dir() samba4srcdir = source4dir()
samba3srcdir = source3dir()
bbdir = os.path.join(srcdir(), "testprogs/blackbox") bbdir = os.path.join(srcdir(), "testprogs/blackbox")
configuration = "--configfile=$SMB_CONF_PATH" configuration = "--configfile=$SMB_CONF_PATH"
@ -233,3 +237,9 @@ def plansmbtorture4testsuite(name, env, options, target, modname=None):
def smbtorture4_testsuites(prefix): def smbtorture4_testsuites(prefix):
return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list) return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
smbclient3 = binpath('smbclient3')
smbtorture3 = binpath('smbtorture3')
ntlm_auth3 = binpath('ntlm_auth3')
net = binpath('net')

7
source3/selftest/tests.py
View File

@ -22,14 +22,9 @@ import os, sys
sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "../../selftest"))) sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "../../selftest")))
import selftesthelpers import selftesthelpers
from selftesthelpers import * from selftesthelpers import *
samba3srcdir = srcdir() + "/source3"
scriptdir = os.path.join(samba3srcdir, "../script/tests") scriptdir = os.path.join(samba3srcdir, "../script/tests")
smbclient3 = binpath('smbclient3')
wbinfo = binpath('wbinfo') wbinfo = binpath('wbinfo')
net = binpath('net')
smbtorture3 = binpath('smbtorture3')
ntlm_auth3 = binpath('ntlm_auth3')
dbwrap_tool = binpath('dbwrap_tool') dbwrap_tool = binpath('dbwrap_tool')
vfstest = binpath('vfstest') vfstest = binpath('vfstest')
@ -218,7 +213,7 @@ plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local",
scriptdir, "$SMB_CONF_PATH", net, configuration]) scriptdir, "$SMB_CONF_PATH", net, configuration])
plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local", plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"), [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", plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc",
[os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"), [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc']) scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc'])