s4-selftest: enable logging in valgrind server xterm
[kamenim/samba.git] / source4 / selftest / wscript
index 7ecb6bab363f7c40210bc6fe39cef257dd3411c8..d07ae0ff353eaac7f51c411f1599c1d10b07d038 100644 (file)
@@ -1,20 +1,35 @@
+#!/usr/bin/env python
+# vim: expandtab ft=python
+
 # selftest main code.
 
 import Scripting, os, Options, Utils, Environment, optparse, sys
-from samba_utils import RUN_COMMAND, ADD_LD_LIBRARY_PATH
+from samba_utils import *
+from samba_autoconf import *
 
 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('--with-selftest-prefix',
+                   help=("specify location of selftest directory (default=./st)"),
+                   action="store", dest='SELFTEST_PREFIX', default='./st')
+
     opt.ADD_COMMAND('test', cmd_test)
     opt.ADD_COMMAND('testonly', cmd_testonly)
 
     gr = opt.add_option_group('test options')
 
-    gr.add_option('--with-selftest-prefix',
-                  help=("specify location of selftest directory"),
-                  action="store", dest='SELFTEST_PREFIX', default='./st')
+    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('--tests',
                   help=("wildcard pattern of tests to run"),
                   action="store", dest='TESTS', default='')
+    gr.add_option('--filtered-subunit',
+                  help=("output (xfail) filtered subunit"),
+                  action="store_true", dest='FILTERED_SUBUNIT', default=False)
     gr.add_option('--quick',
                   help=("enable only quick tests"),
                   action="store_true", dest='QUICKTEST', default=False)
@@ -33,19 +48,34 @@ def set_options(opt):
     gr.add_option('--valgrind-server',
                   help=("use valgrind on the server in the tests (opens an xterm)"),
                   action="store_true", dest='VALGRIND_SERVER', default=False)
-
+    gr.add_option('--gdbtest',
+                  help=("run the testsuite within a gdb xterm window"),
+                  action="store_true", dest='GDBTEST', default=False)
+    gr.add_option('--socket-wrapper-pcap',
+                  help=("create a pcap file for each failing test"),
+                  action="store_true", dest='SOCKET_WRAPPER_PCAP', default=False)
+    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)
+
+def configure(conf):
+    conf.env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
 
 def cmd_testonly(opt):
     '''run tests without doing a build first'''
-    env = Environment.Environment()
+    env = LOAD_ENVIRONMENT()
+    opt.env = env
+
+    if (not CONFIG_SET(opt, 'NSS_WRAPPER') or
+        not CONFIG_SET(opt, 'UID_WRAPPER') or
+        not CONFIG_SET(opt, 'SOCKET_WRAPPER')):
+        print("ERROR: You must use --enable-selftest to enable selftest")
+        sys.exit(1)
 
     env.TESTS  = Options.options.TESTS
-    env.PERL   = 'perl -W'
-    env.PYTHON = 'python'
 
-    env.TEST_FORMAT = 'plain'
-    env.SUBUNIT_FORMATTER = '${PERL} ../selftest/format-subunit.pl --prefix=${SELFTEST_PREFIX} --format=${TEST_FORMAT} --immediate'
-    env.FILTER_XFAIL = '${PERL} ../selftest/filter-subunit.pl --expected-failures=./selftest/knownfail'
+    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.FORMAT_TEST_OUTPUT = '${SUBUNIT_FORMATTER}'
 
     env.OPTIONS = ''
@@ -53,24 +83,30 @@ def cmd_testonly(opt):
         env.OPTIONS += ' --exclude=./selftest/slow'
     if Options.options.QUICKTEST:
         env.OPTIONS += ' --quick --include=./selftest/quick'
-
+    if Options.options.LOAD_LIST:
+        env.OPTIONS += ' --load-list=%s' % Options.options.LOAD_LIST
     if Options.options.TESTENV:
         env.OPTIONS += ' --testenv'
+    if Options.options.SOCKET_WRAPPER_PCAP:
+        env.OPTIONS += ' --socket-wrapper-pcap'
+    if Options.options.SOCKET_WRAPPER_KEEP_PCAP:
+        env.OPTIONS += ' --socket-wrapper-keep-pcap'
 
     if os.environ.get('RUN_FROM_BUILD_FARM') is not None:
         env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output'
     else:
-        env.FILTER_OPTIONS = '${FILTER_XFAIL} | ${FORMAT_TEST_OUTPUT}'
+        env.FILTER_OPTIONS = '${FILTER_XFAIL}'
 
     if Options.options.VALGRIND:
-       os.environ['VALGRIND'] = 'valgrind -q --num-callers=30'
+        os.environ['VALGRIND'] = 'valgrind -q --num-callers=30'
         if Options.options.VALGRINDLOG is not None:
             os.environ['VALGRIND'] += ' --log-file=%s' % Options.options.VALGRINDLOG
 
     if Options.options.VALGRIND_SERVER:
-       os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/valgrind_run A=B '
+        os.environ['SAMBA_VALGRIND'] = 'xterm -n server -l -e ../selftest/valgrind_run DUMMY=X'
 
-    env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
+    if Options.options.GDBTEST:
+        os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/gdb_run DUMMY=X'
 
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')
@@ -82,10 +118,19 @@ def cmd_testonly(opt):
     if os.path.exists(st_done):
         os.unlink(st_done)
 
-    cmd = '(perl -W ../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS}'
+    cmd = '(${PERL} ../selftest/selftest.pl --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'
+    if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
+        cmd += ' | ${FORMAT_TEST_OUTPUT}'
+    cmd = EXPAND_VARIABLES(opt, cmd)
 
-    print "test: running %s" % cmd
+    print("test: running %s" % cmd)
     ret = RUN_COMMAND(cmd, env=env)
+    if os.path.exists(".testrepository"):
+        # "testr load -q" isn't
+        cmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null'
+        cmd = EXPAND_VARIABLES(opt, cmd)
+        RUN_COMMAND(cmd, env=env)
+
     if ret != 0:
         print("ERROR: test failed with exit code %d" % ret)
         sys.exit(ret)