From 1116ee1c5c47b405666a0d52f646d05613a803ab Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 2 May 2017 12:55:45 +0200 Subject: 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 Reviewed-by: Andreas Schneider Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sat May 20 02:26:33 CEST 2017 on sn-devel-144 --- selftest/selftesthelpers.py | 2 +- selftest/wscript | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'selftest') 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|" ' + -- cgit v1.2.1