git.samba.org
/
amitay
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s4-dsdb: special case for deleted objects one way link
[amitay/samba.git]
/
source3
/
selftest
/
wscript
diff --git
a/source3/selftest/wscript
b/source3/selftest/wscript
index 632e58526ea9e9b9c07bbeb60b9adf3fc55919f4..1a266880c8047632c3e8f9bc4de5b006acb75ed5 100644
(file)
--- a/
source3/selftest/wscript
+++ b/
source3/selftest/wscript
@@
-85,8
+85,10
@@
def cmd_testonly(opt):
env.TESTS = Options.options.TESTS
env.TESTS = Options.options.TESTS
- env.SUBUNIT_FORMATTER = '${PYTHON} -u ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
- env.FILTER_XFAIL = '${PYTHON} -u ../selftest/filter-subunit --expected-failures=./selftest/knownfail'
+ env.SUBUNIT_FORMATTER = os.getenv('SUBUNIT_FORMATTER')
+ if not env.SUBUNIT_FORMATTER:
+ env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
+ env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/source3/selftest/knownfail'
if Options.options.FAIL_IMMEDIATELY:
env.FILTER_XFAIL += ' --fail-immediately'
if Options.options.FAIL_IMMEDIATELY:
env.FILTER_XFAIL += ' --fail-immediately'
@@
-101,11
+103,16
@@
def cmd_testonly(opt):
if o[0:1] != '_':
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
if o[0:1] != '_':
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
- env.OPTIONS = ''
+ binary_mappings = ('smbtorture3:smbtorture,' +
+ 'nmblookup3:nmblookup,' +
+ 'smbclient3:smbclient,' +
+ 'ntlm_auth3:ntlm_auth')
+
+ env.OPTIONS = '--binary-mapping=' + binary_mappings
if not Options.options.SLOWTEST:
if not Options.options.SLOWTEST:
- env.OPTIONS += ' --exclude=
.
/selftest/slow'
+ env.OPTIONS += ' --exclude=
${srcdir}/source3
/selftest/slow'
if Options.options.QUICKTEST:
if Options.options.QUICKTEST:
- env.OPTIONS += ' --quick --include=
.
/selftest/quick'
+ env.OPTIONS += ' --quick --include=
${srcdir}/source3
/selftest/quick'
if Options.options.LOAD_LIST:
env.OPTIONS += ' --load-list=%s' % Options.options.LOAD_LIST
if Options.options.TESTENV:
if Options.options.LOAD_LIST:
env.OPTIONS += ' --load-list=%s' % Options.options.LOAD_LIST
if Options.options.TESTENV:
@@
-129,18
+136,18
@@
def cmd_testonly(opt):
server_wrapper=''
if Options.options.VALGRIND_SERVER:
server_wrapper=''
if Options.options.VALGRIND_SERVER:
- server_wrapper = '
..
/selftest/valgrind_run _DUMMY=X'
+ server_wrapper = '
${srcdir}
/selftest/valgrind_run _DUMMY=X'
elif Options.options.GDBTEST:
elif Options.options.GDBTEST:
- server_wrapper = '
..
/selftest/gdb_run _DUMMY=X'
+ server_wrapper = '
${srcdir}
/selftest/gdb_run _DUMMY=X'
if Options.options.SCREEN:
if Options.options.SCREEN:
- server_wrapper = '
%s/../selftest/in_screen %s' % (os.getcwd(), server_wrapper)
- os.environ['TERMINAL'] =
'%s/../selftest/in_screen' % os.getcwd(
)
+ server_wrapper = '
${srcdir}/selftest/in_screen %s' % server_wrapper
+ os.environ['TERMINAL'] =
EXPAND_VARIABLES(opt, '${srcdir}/selftest/in_screen'
)
elif server_wrapper != '':
server_wrapper = 'xterm -n server -l -e %s' % server_wrapper
if server_wrapper != '':
elif server_wrapper != '':
server_wrapper = 'xterm -n server -l -e %s' % server_wrapper
if server_wrapper != '':
- os.environ['SAMBA_VALGRIND'] =
server_wrapper
+ os.environ['SAMBA_VALGRIND'] =
EXPAND_VARIABLES(opt, server_wrapper)
# this is needed for systems without rpath, or with rpath disabled
ADD_LD_LIBRARY_PATH('bin/shared')
# this is needed for systems without rpath, or with rpath disabled
ADD_LD_LIBRARY_PATH('bin/shared')
@@
-154,6
+161,7
@@
def cmd_testonly(opt):
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
+ os.environ['NSS_WRAPPER_WINBIND_SO_PATH'] = os.path.abspath('bin/default/nsswitch/libnss-winbind.so')
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):
@@
-163,11
+171,11
@@
def cmd_testonly(opt):
os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- cmd = '(${PERL}
%s/../selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit' % (os.getcwd())
+ cmd = '(${PERL}
${srcdir}/selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/source3/selftest/skip --testlist="${srcdir}/source3/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
else:
if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
cmd += ' | ${FORMAT_TEST_OUTPUT}'
else:
- cmd += ' | ${PYTHON} -u
..
/selftest/filter-subunit'
+ cmd += ' | ${PYTHON} -u
${srcdir}
/selftest/filter-subunit'
cmd = EXPAND_VARIABLES(opt, cmd)
print("test: running %s" % cmd)
cmd = EXPAND_VARIABLES(opt, cmd)
print("test: running %s" % cmd)