summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-10 16:49:10 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-10 07:35:26 +0100
commit14edbf71593f2d713050e77ee1d6daf8d8d2b37e (patch)
tree24df7d95fac0b26bee61fbfcaee114489a7dbe25
parent172e0a177dff87043eca649a39e4269edf6111c3 (diff)
downloadsamba-14edbf71593f2d713050e77ee1d6daf8d8d2b37e.tar.gz
samba-14edbf71593f2d713050e77ee1d6daf8d8d2b37e.tar.bz2
samba-14edbf71593f2d713050e77ee1d6daf8d8d2b37e.zip
s4-build: need EXPAND_VARIABLES() for terminal in make test
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org> Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Feb 10 07:35:26 CET 2011 on sn-devel-104
-rw-r--r--source4/selftest/wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index d2a9bc5ee8..783b2ffe04 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -135,7 +135,7 @@ def cmd_testonly(opt):
if Options.options.SCREEN:
server_wrapper = '${srcdir}/selftest/in_screen %s' % server_wrapper
- os.environ['TERMINAL'] = '${srcdir}/selftest/in_screen'
+ os.environ['TERMINAL'] = EXPAND_VARIABLES(opt, '${srcdir}/selftest/in_screen')
elif server_wrapper != '':
server_wrapper = 'xterm -n server -l -e %s' % server_wrapper