diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-05-02 12:55:45 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-05-20 02:26:33 +0200 |
| commit | 1116ee1c5c47b405666a0d52f646d05613a803ab (patch) | |
| tree | c26921f00ef5a9ad89110e580ae4dff2177aa297 /selftest | |
| parent | e99c0e6503d5cfa048c62b0a6d954d3e7504ff62 (diff) | |
| download | samba-1116ee1c5c47b405666a0d52f646d05613a803ab.tar.gz | |
selftest: Actually run python3 tests during the selftest
These previously only ran if the develper was using EXTRA_PYTHON in their
OS environment
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat May 20 02:26:33 CEST 2017 on sn-devel-144
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/selftesthelpers.py | 2 | ||||
| -rw-r--r-- | selftest/wscript | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 6b22a16bfa5..8b885b59419 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -140,7 +140,7 @@ def planpythontestsuite(env, module, name=None, extra_path=[], py3_compatible=Fa if py3_compatible and extra_python is not None: # Plan one more test for Python 3 compatible module args[0] = extra_python - plantestsuite_loadlist(name, env, args) + plantestsuite_loadlist(name + ".python3", env, args) def get_env_torture_options(): diff --git a/selftest/wscript b/selftest/wscript index 2299195428f..d8094af1cdc 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -209,6 +209,10 @@ def cmd_testonly(opt): env.TESTLISTS = '--testlist=%r' % Options.options.TEST_LIST elif Options.options.PERF_TEST: env.TESTLISTS = '--testlist="${PYTHON} ${srcdir}/selftest/perf_tests.py|" ' + elif CONFIG_SET(opt, 'EXTRA_PYTHON'): + env.TESTLISTS = ('--testlist="EXTRA_PYTHON=${EXTRA_PYTHON} ${PYTHON} ${srcdir}/selftest/tests.py|" ' + + '--testlist="EXTRA_PYTHON=${EXTRA_PYTHON} ${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' + + '--testlist="EXTRA_PYTHON=${EXTRA_PYTHON} ${PYTHON} ${srcdir}/source4/selftest/tests.py|"') else: env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/selftest/tests.py|" ' + '--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' + |