s4-selftest: support 'make testenv SCREEN=1'

[samba.git] / source4 / selftest / wscript

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index d07ae0ff353eaac7f51c411f1599c1d10b07d038..561baeb6e1174ee19831b1e6ea4e2c2c72a8708f 100644 (file)
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -48,9 +48,15 @@ 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('--screen',
+                  help=("run the samba servers in screen sessions"),
+                  action="store_true", dest='SCREEN', default=False)
     gr.add_option('--gdbtest',
-                  help=("run the testsuite within a gdb xterm window"),
+                  help=("run the servers within a gdb 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)
@@ -72,12 +78,26 @@ def cmd_testonly(opt):
         print("ERROR: You must use --enable-selftest to enable selftest")
         sys.exit(1)
 
+    os.environ['SAMBA_SELFTEST'] = '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}'
 
+    # clean any previous temporary files
+    os.system("rm -rf %s/tmp" % env.SELFTEST_PREFIX);
+
+    # 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, ''))
+
     env.OPTIONS = ''
     if not Options.options.SLOWTEST:
         env.OPTIONS += ' --exclude=./selftest/slow'
@@ -102,11 +122,21 @@ def cmd_testonly(opt):
         if Options.options.VALGRINDLOG is not None:
             os.environ['VALGRIND'] += ' --log-file=%s' % Options.options.VALGRINDLOG
 
+    server_wrapper=''
+
     if Options.options.VALGRIND_SERVER:
-        os.environ['SAMBA_VALGRIND'] = 'xterm -n server -l -e ../selftest/valgrind_run DUMMY=X'
+        server_wrapper = '../selftest/valgrind_run _DUMMY=X'
+    elif Options.options.GDBTEST:
+        server_wrapper = '../selftest/gdb_run _DUMMY=X'
+
+    if Options.options.SCREEN:
+        server_wrapper = '../selftest/in_screen %s' % server_wrapper
+        os.environ['TERMINAL'] = '../selftest/in_screen'
+    elif server_wrapper != '':
+        server_wrapper = 'xterm -n server -l -e %s' % server_wrapper
 
-    if Options.options.GDBTEST:
-        os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/gdb_run DUMMY=X'
+    if server_wrapper != '':
+        os.environ['SAMBA_VALGRIND'] = server_wrapper
 
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')
@@ -118,7 +148,7 @@ def cmd_testonly(opt):
     if os.path.exists(st_done):
         os.unlink(st_done)
 
-    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'
+    cmd = '(${PERL} ../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="${PYTHON} ./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}'
     cmd = EXPAND_VARIABLES(opt, cmd)