From 0b5644bd5713d1dcea276c97330053f58acc83b7 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 13 Dec 2016 10:18:08 +0100 Subject: 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 --- build_history/blacklist.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'build_history/blacklist.txt') 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 -- cgit v1.2.3