X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=selftest%2Fwscript;h=94232d3aac134a45dea0b5ef2164d1953a0721e7;hb=30cc2e7755074758a16fcf2a8d818321ee0b4021;hp=1509b1a5a43840dc82352933cc2a2dc8264cf145;hpb=4a9235f903cc25628cb4a46aec845763b55c4b26;p=obnox%2Fsamba%2Fsamba-obnox.git diff --git a/selftest/wscript b/selftest/wscript index 1509b1a5a43..94232d3aac1 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -6,25 +6,33 @@ import Scripting, os, Options, Utils, Environment, optparse, sys from samba_utils import * from samba_autoconf import * +import types + +DEFAULT_SELFTEST_PREFIX="./st" def set_options(opt): opt.add_option('--enable-selftest', help=("enable options necessary for selftest (default=no)"), action="store_true", dest='enable_selftest', default=False) + opt.add_option('--enable-coverage', + help=("enable options necessary for code coverage " + "reporting on selftest (default=no)"), + action="store_true", dest='enable_coverage', default=False) opt.add_option('--with-selftest-prefix', - help=("specify location of selftest directory (default=./st)"), - action="store", dest='SELFTEST_PREFIX', default='./st') + help=("specify location of selftest directory " + "(default=%s)" % DEFAULT_SELFTEST_PREFIX), + action="store", dest='SELFTEST_PREFIX', default=DEFAULT_SELFTEST_PREFIX) opt.ADD_COMMAND('test', cmd_test) opt.ADD_COMMAND('testonly', cmd_testonly) gr = opt.add_option_group('test options') - gr.add_option('--load-list', + gr.add_option('--load-list', help=("Load a test id list from a text file"), action="store", dest='LOAD_LIST', default=None) - gr.add_option('--list', + gr.add_option('--list', help=("List available tests"), action="store_true", dest='LIST', default=False) gr.add_option('--tests', @@ -39,6 +47,9 @@ def set_options(opt): gr.add_option('--slow', help=("enable the really slow tests"), action="store_true", dest='SLOWTEST', default=False) + gr.add_option('--nb-slowest', + help=("Show the n slowest tests (default=10)"), + type=int, default=10, dest='NB_SLOWEST') gr.add_option('--testenv', help=("start a terminal with the test environment setup"), action="store_true", dest='TESTENV', default=False) @@ -66,15 +77,28 @@ def set_options(opt): gr.add_option('--socket-wrapper-keep-pcap', help=("create a pcap file for all individual test"), action="store_true", dest='SOCKET_WRAPPER_KEEP_PCAP', default=False) + gr.add_option('--random-order', dest='RANDOM_ORDER', default=False, + action="store_true", help="Run testsuites in random order") def configure(conf): conf.env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX + conf.env.enable_coverage = Options.options.enable_coverage + if conf.env.enable_coverage: + conf.ADD_LDFLAGS('-lgcov', testflags=True) + conf.ADD_CFLAGS('--coverage') + + if Options.options.enable_selftest or Options.options.developer: + conf.DEFINE('ENABLE_SELFTEST', 1) + def cmd_testonly(opt): '''run tests without doing a build first''' env = LOAD_ENVIRONMENT() opt.env = env + if Options.options.SELFTEST_PREFIX != DEFAULT_SELFTEST_PREFIX: + env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX + if (not CONFIG_SET(opt, 'NSS_WRAPPER') or not CONFIG_SET(opt, 'UID_WRAPPER') or not CONFIG_SET(opt, 'SOCKET_WRAPPER')): @@ -88,7 +112,7 @@ def cmd_testonly(opt): 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}/selftest/knownfail' + env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/selftest/knownfail --flapping=${srcdir}/selftest/flapping' if Options.options.FAIL_IMMEDIATELY: env.FILTER_XFAIL += ' --fail-immediately' @@ -101,14 +125,20 @@ def cmd_testonly(opt): # put all command line options in the environment as TESTENV_*=* for o in dir(Options.options): if o[0:1] != '_': - os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) + val = getattr(Options.options, o, '') + if not issubclass(type(val), types.FunctionType) \ + and not issubclass(type(val), types.MethodType): + os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, '')) - binary_mapping = ('nmblookup3:nmblookup3,' + - 'smbclient3:smbclient3,' + - 'smbtorture4:smbtorture,' + - 'ntlm_auth3:ntlm_auth3') - env.OPTIONS = '--binary-mapping=%s' % binary_mapping + binary_mapping = ('nmblookup3:nmblookup,' + + 'nmblookup4:nmblookup4,' + + 'smbclient3:smbclient,' + + 'smbclient4:smbclient4,' + + 'smbtorture4:smbtorture,' + + 'ntlm_auth3:ntlm_auth') + + env.OPTIONS = '--binary-mapping=%s' % binary_mapping if not Options.options.SLOWTEST: env.OPTIONS += ' --exclude=${srcdir}/selftest/slow' if Options.options.QUICKTEST: @@ -121,6 +151,8 @@ def cmd_testonly(opt): env.OPTIONS += ' --socket-wrapper-pcap' if Options.options.SOCKET_WRAPPER_KEEP_PCAP: env.OPTIONS += ' --socket-wrapper-keep-pcap' + if Options.options.RANDOM_ORDER: + env.OPTIONS += ' --random-order' if os.environ.get('RUN_FROM_BUILD_FARM') is not None: env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output' else: @@ -146,6 +178,9 @@ def cmd_testonly(opt): if server_wrapper != '': os.environ['SAMBA_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper) + os.environ['NMBD_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper) + os.environ['WINBINDD_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper) + os.environ['SMBD_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper) # this is needed for systems without rpath, or with rpath disabled ADD_LD_LIBRARY_PATH('bin/shared') @@ -154,13 +189,9 @@ def cmd_testonly(opt): # if we are using a system version of ldb then we need to tell it to # load modules from our modules path if env.USING_SYSTEM_LDB: - os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb' - - if env.BUILD_TDB2: - os.environ['BUILD_TDB2'] = '1' + os.environ['LDB_MODULES_PATH'] = os.path.abspath(os.path.join(env.cwd, 'bin/modules/ldb')) # tell build system where to find config.h - os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs') os.environ['CONFIG_H'] = 'bin/default/include/config.h' st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done') @@ -170,36 +201,61 @@ def cmd_testonly(opt): if not os.path.isdir(env.SELFTEST_PREFIX): os.makedirs(env.SELFTEST_PREFIX, int('755', 8)) - env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' + + env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/selftest/tests.py|" ' + + '--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' + '--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"') - # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8). - env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=samba --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}' + if CONFIG_SET(opt, 'AD_DC_BUILD_IS_ENABLED'): + env.SELFTEST_TARGET = "samba" + else: + env.SELFTEST_TARGET = "samba3" + + env.OPTIONS += " --nss_wrapper_so_path=" + CONFIG_GET(opt, 'LIBNSS_WRAPPER_SO_PATH') + env.OPTIONS += " --resolv_wrapper_so_path=" + CONFIG_GET(opt, 'LIBRESOLV_WRAPPER_SO_PATH') + env.OPTIONS += " --socket_wrapper_so_path=" + CONFIG_GET(opt, 'LIBSOCKET_WRAPPER_SO_PATH') + env.OPTIONS += " --uid_wrapper_so_path=" + CONFIG_GET(opt, 'LIBUID_WRAPPER_SO_PATH') + + if unversioned_sys_platform in ('freebsd', 'netbsd', 'openbsd', 'sunos'): + env.OPTIONS += " --use-dns-faking" + + subunit_cache = None + # We use the full path rather than relative path to avoid problems on some platforms (ie. solaris 8). + env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}' if Options.options.LIST: cmd = '${CORE_COMMAND} --list' else: env.OPTIONS += ' --socket-wrapper' - cmd = '(${CORE_COMMAND} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit' + cmd = '(${CORE_COMMAND} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS}' if (os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT): - cmd += ' | ${FORMAT_TEST_OUTPUT}' + subunit_cache = os.path.join(Options.options.SELFTEST_PREFIX, "subunit") + cmd += ' | tee %s | ${FORMAT_TEST_OUTPUT}' % subunit_cache else: - cmd += ' | ${PYTHON} -u ${srcdir}/selftest/filter-subunit' + cmd += ' | ${FILTER_OPTIONS}' runcmd = EXPAND_VARIABLES(opt, cmd) print("test: running %s" % runcmd) ret = RUN_COMMAND(cmd, env=env) - if os.path.exists(".testrepository") and not Options.options.LIST: - # "testr load -q" isn't - testrcmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null' + + if (os.path.exists(".testrepository") and + not Options.options.LIST and + not Options.options.LOAD_LIST and + subunit_cache is not None): + testrcmd = 'testr load -q < %s > /dev/null' % subunit_cache runcmd = EXPAND_VARIABLES(opt, testrcmd) RUN_COMMAND(runcmd, env=env) + if subunit_cache is not None: + nb = Options.options.NB_SLOWEST + cmd = "./script/show_testsuite_time %s %d" % (subunit_cache, nb) + runcmd = EXPAND_VARIABLES(opt, cmd) + RUN_COMMAND(runcmd, env=env) + if ret != 0: print("ERROR: test failed with exit code %d" % ret) sys.exit(ret) - if not os.path.exists(st_done): + if not Options.options.LIST and not os.path.exists(st_done): print("ERROR: test command failed to complete") sys.exit(1) @@ -212,8 +268,5 @@ def cmd_test(opt): # if running all tests, then force a symbol check env = LOAD_ENVIRONMENT() CHECK_MAKEFLAGS(env) - if not Options.options.TESTS: - Options.options.DUP_SYMBOLCHECK = True - Scripting.commands.append('build') Scripting.commands.append('testonly')