s3-waf: add basic make test infrastructure, not able to test yet.

Guenther

3 files changed, 158 insertions, 0 deletions

diff --git a/source3/selftest/slow b/source3/selftest/slow
new file mode 100644
index 0000000000..bb3b066b49
--- /dev/null
+++ b/source3/selftest/slow
@@ -0,0 +1 @@
+#none
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
new file mode 100644
index 0000000000..b3139d531c
--- /dev/null
+++ b/source3/selftest/wscript
@@ -0,0 +1,155 @@
+#!/usr/bin/env python
+# vim: expandtab ft=python
+
+# selftest main code.
+
+import Scripting, os, Options, Utils, Environment, optparse, sys
+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('--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)
+    gr.add_option('--slow',
+                  help=("enable the really slow tests"),
+                  action="store_true", dest='SLOWTEST', default=False)
+    gr.add_option('--testenv',
+                  help=("start a terminal with the test environment setup"),
+                  action="store_true", dest='TESTENV', default=False)
+    gr.add_option('--valgrind',
+                  help=("use valgrind on client programs in the tests"),
+                  action="store_true", dest='VALGRIND', default=False)
+    gr.add_option('--valgrind-log',
+                  help=("where to put the valgrind log"),
+                  action="store", dest='VALGRINDLOG', default=None)
+    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('--fail-immediately',
+                  help=("stop tests on first failure"),
+                  action="store_true", dest='FAIL_IMMEDIATELY', 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 = 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.SUBUNIT_FORMATTER = '${PYTHON} -u ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
+    env.FILTER_XFAIL = '${PYTHON} -u ../selftest/filter-subunit --expected-failures=./selftest/knownfail'
+
+    if Options.options.FAIL_IMMEDIATELY:
+        env.FILTER_XFAIL += ' --fail-immediately'
+
+    env.FORMAT_TEST_OUTPUT = '${SUBUNIT_FORMATTER}'
+
+    env.OPTIONS = ''
+    if not Options.options.SLOWTEST:
+        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}'
+
+    if Options.options.VALGRIND:
+        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 -l -e ../selftest/valgrind_run DUMMY=X'
+
+    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')
+
+    # tell build system where to find config.h
+    os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
+
+    st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
+    if os.path.exists(st_done):
+        os.unlink(st_done)
+
+    cmd = '(${PERL} ../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'
+    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)
+    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)
+
+    if not os.path.exists(st_done):
+        print("ERROR: test command failed to complete")
+        sys.exit(1)
+
+
+########################################################################
+# main test entry point
+def cmd_test(opt):
+    '''Run the test suite (see test options below)'''
+    Scripting.commands.append('build')
+    Scripting.commands.append('testonly')
diff --git a/source3/wscript b/source3/wscript
index d124eb6fa5..909008b234 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -20,6 +20,7 @@ def set_options(opt):
     opt.BUNDLED_EXTENSION_DEFAULT('s3')
     opt.RECURSE('../lib/replace')
     opt.RECURSE('build')
+    opt.RECURSE('selftest')
     opt.RECURSE('../lib/nss_wrapper')
     opt.RECURSE('../lib/socket_wrapper')
     opt.RECURSE('../lib/tevent')
@@ -405,6 +406,7 @@ return acl_get_perm_np(permset_d, perm);
         conf.DEFINE('WITH_WINBIND', '1')
 
     conf.find_program('awk', var='AWK')
+    conf.find_program('perl', var='PERL')
 
     # Darwin has extra options to xattr-family functions
     conf.CHECK_CODE('getxattr(0, 0, 0, 0, 0, 0);',