diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-13 10:18:08 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-13 09:55:47 +0000 |
| commit | 0b5644bd5713d1dcea276c97330053f58acc83b7 (patch) | |
| tree | c3e14f48f398eacfabb7c3eeae8fe7d6fbd981a7 | |
| parent | 23ec977c1d348ec2bfdf933a9d6caf5b0ae985b0 (diff) | |
testrunner.py: Use 'linux' as classifier instead of legacy 'linux2'
Python 2.X returns 'linux2' as platform for compatibility reasons regardless
of the kernel version whereas Python 3.3 onwards returns 'linux'.
Fixes blacklisting to work with newer versions of Python.
Change-Id: I1d3fd72feaa42bd5c89fa10a9a73474a92a6ab53
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | build_history/blacklist.txt | 42 | ||||
| -rw-r--r-- | testrunner.py | 8 |
2 files changed, 26 insertions, 24 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt index 806378988..aa7c724bc 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -5,37 +5,37 @@ [pysidetest::utils_test] win32 [signals::disconnect_test] - linux2 + linux darwin py2 win32 [signals::multiple_connections_test] - linux2 + linux darwin win32 [signals::ref06_test] - linux2 + linux darwin win32 [signals::short_circuit_test] - linux2 + linux darwin win32 [signals::signal_signature_test] - linux2 + linux darwin win32 [signals::static_metaobject_test] - linux2 + linux darwin win32 [QtCore::bug_829] win32 [QtCore::bug_1063] - linux2 + linux darwin win32 [QtCore::deepcopy_test] - linux2 + linux darwin win32 [QtCore::qfile_test] @@ -45,52 +45,52 @@ win32 darwin py3 [QtCore::qobject_connect_notify_test] - linux2 + linux darwin win32 [QtCore::qthread_test] - linux2 + linux [QtCore::qtextstream_test] - linux2 + linux darwin win32 [QtCore::repr_test] - linux2 + linux darwin win32 [QtGui::qmatrix_test] win32 [QtWidgets::bug_576] - linux2 + linux win32 darwin py3 [QtWidgets::bug_722] - linux2 + linux darwin win32 [QtWidgets::bug_919] - linux2 + linux [QtWidgets::qstandarditemmodel_test] - linux2 + linux darwin win32 [QtWidgets::returnquadruplesofnumbers_test] - linux2 + linux darwin win32 [QtTest::touchevent_test] - linux2 + linux darwin win32 [QtMultimedia::audio_test] - linux2 + linux darwin win32 [QtScript::qscriptvalue_test] - linux2 + linux darwin win32 [QtScriptTools::debugger_test] - linux2 + linux darwin win32 diff --git a/testrunner.py b/testrunner.py index c648bb201..d4a57dcc0 100644 --- a/testrunner.py +++ b/testrunner.py @@ -154,7 +154,9 @@ class BuildLog(object): def classifiers(self): if not self.selected: raise ValueError('+++ No build with the configuration found!') - res = [sys.platform] + # Python2 legacy: Correct 'linux2' to 'linux' + platform = 'linux' if sys.platform == 'linux2' else sys.platform + res = [platform] # the rest must be guessed from the given filename path = self.selected.build_dir base = os.path.basename(path) @@ -431,7 +433,7 @@ Known keys are: darwin win32 -linux2 +linux ... qt5.6.1 @@ -521,7 +523,7 @@ the following: The global section gets the complete set of variables, like so # Globals - darwin win32 linux2 + darwin win32 linux qt5.6.1 qt5.6.2 py3 py2 32bit 64bit |