s4-build: need EXPAND_VARIABLES() for terminal in make test
authorAndrew Tridgell <tridge@samba.org>
Thu, 10 Feb 2011 05:49:10 +0000 (16:49 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 10 Feb 2011 06:35:26 +0000 (07:35 +0100)
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

source4/selftest/wscript

index d2a9bc5ee860bcb2f3dac6f84072d344f1f31184..783b2ffe04e6dcaf2cdcba62d5b9c63eac025235 100644 (file)
@@ -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