s4-selftest: enable logging in valgrind server xterm

[kamenim/samba.git] / source4 / selftest / wscript

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 5e42e6fb67c15e2d66cb1e04a05f69602fd0d4c9..d07ae0ff353eaac7f51c411f1599c1d10b07d038 100644 (file)
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# vim: expandtab ft=python
 
 # selftest main code.
 
@@ -95,8 +96,6 @@ def cmd_testonly(opt):
         env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output'
     else:
         env.FILTER_OPTIONS = '${FILTER_XFAIL}'
-        if not Options.options.FILTERED_SUBUNIT:
-            env.FILTER_OPTIONS += ' | ${FORMAT_TEST_OUTPUT}'
 
     if Options.options.VALGRIND:
         os.environ['VALGRIND'] = 'valgrind -q --num-callers=30'
@@ -104,7 +103,7 @@ def cmd_testonly(opt):
             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 DUMMY=X'
+        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'
@@ -119,11 +118,19 @@ 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}'
+    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)
     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)