summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-02 14:23:43 -0700
committerAndrew Tridgell <tridge@samba.org>2010-10-02 21:11:53 -0700
commitdfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6 (patch)
treec4271f8edf108c8d4e4b353be3c67f9fb68a7ca1 /source4
parent29e1a847ddb28aee8ae04578b74cb8ab97427b96 (diff)
downloadsamba-dfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6.tar.gz
samba-dfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6.tar.bz2
samba-dfb664a1822f41cbd4f1f5a8ce6fcac4e1547bf6.zip
s4-selftest: support 'make testenv SCREEN=1'
this can be used to start a test envioronment in screen windows. Use: make testenv SCREEN=1 SELFTEST_TESTENV=dc to launch just one environment (in this case, "dc")
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/wscript4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 4606c6681a..561baeb6e1 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -90,6 +90,9 @@ def cmd_testonly(opt):
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] != '_':
@@ -128,6 +131,7 @@ def cmd_testonly(opt):
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