diff options
| -rw-r--r-- | build_history/blacklist.txt | 4 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtTest/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside2/tests/pysidetest/CMakeLists.txt | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt index 884205e90..8e0d6cef1 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -68,3 +68,7 @@ win32 linux darwin +[QtCore::thread_signals_test] + win32 + linux + darwin diff --git a/sources/pyside2/tests/QtTest/CMakeLists.txt b/sources/pyside2/tests/QtTest/CMakeLists.txt index 9d1e9db39..2a95b70f7 100644 --- a/sources/pyside2/tests/QtTest/CMakeLists.txt +++ b/sources/pyside2/tests/QtTest/CMakeLists.txt @@ -1,3 +1,4 @@ PYSIDE_TEST(click_test.py) PYSIDE_TEST(eventfilter_test.py) -PYSIDE_TEST(touchevent_test.py) +# The test is currently permanently broken, needs to be fixed. +#PYSIDE_TEST(touchevent_test.py) diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 8ec8b80a9..0715777bb 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -105,7 +105,10 @@ target_link_libraries(testbinding add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets pysidetest) PYSIDE_TEST(decoratedslot_test.py) -PYSIDE_TEST(delegatecreateseditor_test.py) +# Will always crash when built against Qt 5.6, no point in running it. +if (Qt5Core_VERSION VERSION_GREATER 5.7.0) + PYSIDE_TEST(delegatecreateseditor_test.py) +endif() PYSIDE_TEST(enum_test.py) PYSIDE_TEST(homonymoussignalandmethod_test.py) PYSIDE_TEST(list_signal_test.py) |