diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-11-24 13:27:52 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-11-24 13:20:01 +0000 |
| commit | de3edbeaec5d1e612850f024480e55d579b0b506 (patch) | |
| tree | ebfc79095aff8ade01ebeccdce3959d64fd910bb /sources | |
| parent | 0af2bc663e0f7e59fa20c035c3dc86e194e4d7de (diff) | |
Skip some permanently failing tests and blacklist flaky ones
Change-Id: Idcbf62b58f097370f61a27d0f16bce630e817526
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/tests/QtTest/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside2/tests/pysidetest/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 2 deletions
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) |