s4-waf: show the fully expanded test command
authorAndrew Tridgell <tridge@samba.org>
Tue, 30 Mar 2010 00:54:23 +0000 (11:54 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 6 Apr 2010 10:27:17 +0000 (20:27 +1000)
this makes it easier to run it separately

source4/selftest/wscript

index 664061bcf147c55d3389774454ab327bfb072de3..8969d4694d216da3f3aeaec1978e62a6d53e761c 100644 (file)
@@ -40,6 +40,7 @@ def set_options(opt):
 def cmd_testonly(opt):
     '''run tests without doing a build first'''
     env = LOAD_ENVIRONMENT()
+    opt.env = env
 
     env.TESTS  = Options.options.TESTS
 
@@ -82,6 +83,7 @@ def cmd_testonly(opt):
         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 = EXPAND_VARIABLES(opt, cmd)
 
     print "test: running %s" % cmd
     ret = RUN_COMMAND(cmd, env=env)