aboutsummaryrefslogtreecommitdiffstats
path: root/testrunner.py
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-12-13 10:18:08 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-12-13 09:55:47 +0000
commit0b5644bd5713d1dcea276c97330053f58acc83b7 (patch)
treec3e14f48f398eacfabb7c3eeae8fe7d6fbd981a7 /testrunner.py
parent23ec977c1d348ec2bfdf933a9d6caf5b0ae985b0 (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>
Diffstat (limited to 'testrunner.py')
-rw-r--r--testrunner.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/testrunner.py b/testrunner.py
index c648bb20..d4a57dcc 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