diff options
| author | Thomas Nagy <tnagy1024@gmail.com> | 2010-04-08 07:45:46 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-08 07:46:39 +1000 |
| commit | 7f3116a63d7d91f4c0d26adf8fcdef0a5a957971 (patch) | |
| tree | 46e95f69b7637c38dbbc20455c3dc99408a93df7 /source4/selftest | |
| parent | 64957ce0686761acd2a2a7ec1787898d2d8238b6 (diff) | |
| download | samba-7f3116a63d7d91f4c0d26adf8fcdef0a5a957971.tar.gz samba-7f3116a63d7d91f4c0d26adf8fcdef0a5a957971.tar.bz2 samba-7f3116a63d7d91f4c0d26adf8fcdef0a5a957971.zip | |
build: allow the waf build to work with python 3.0 and 3.1
Python 3.x is a bit fussier about print statements and indentation.
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 5f4216f0e2..a36b93561e 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -49,7 +49,7 @@ def cmd_testonly(opt): if (not CONFIG_SET(opt, 'NSS_WRAPPER') or not CONFIG_SET(opt, 'UID_WRAPPER') or not CONFIG_SET(opt, 'SOCKET_WRAPPER')): - print "ERROR: You must use --enable-selftest to enable selftest" + print("ERROR: You must use --enable-selftest to enable selftest") sys.exit(1) env.TESTS = Options.options.TESTS @@ -73,12 +73,12 @@ def cmd_testonly(opt): env.FILTER_OPTIONS = '${FILTER_XFAIL} | ${FORMAT_TEST_OUTPUT}' if Options.options.VALGRIND: - os.environ['VALGRIND'] = 'valgrind -q --num-callers=30' + os.environ['VALGRIND'] = 'valgrind -q --num-callers=30' if Options.options.VALGRINDLOG is not None: 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 A=B ' + os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/valgrind_run A=B ' env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX @@ -95,7 +95,7 @@ def cmd_testonly(opt): 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 + print("test: running %s" % cmd) ret = RUN_COMMAND(cmd, env=env) if ret != 0: print("ERROR: test failed with exit code %d" % ret) |