diff options
| author | Andreas Buhr <andreas@andreasbuhr.de> | 2022-04-14 14:04:23 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-18 18:36:14 +0000 |
| commit | 587c55ca3f30027a0785da73af5c92be4c7146ce (patch) | |
| tree | 8858c2b645b0aea626743183a131e371be7aabe9 /tests/auto/quick/scenegraph | |
| parent | b29ae957a5ce8878af5d4fa328d34db068f9d2d5 (diff) | |
Fix most of tst_scenegraph on Android and blacklist remaining tests
Most of the tests in tst_scenegraph are fixed by properly
including its test data. This is done by this patch.
Some errors remain. These are blacklisted by this patch.
Task-number: QTBUG-102589
Change-Id: I131125fe16a08595d2ac408ed5aff1d067a44c2f
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 1ea4bde6ed0442f49da87751683f8ad5216ca083)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/quick/scenegraph')
| -rw-r--r-- | tests/auto/quick/scenegraph/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/quick/scenegraph/CMakeLists.txt | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/quick/scenegraph/BLACKLIST b/tests/auto/quick/scenegraph/BLACKLIST new file mode 100644 index 0000000000..80f39de9ab --- /dev/null +++ b/tests/auto/quick/scenegraph/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-102589 +[render] +android diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt index 0dc617975e..05fd9dc9ec 100644 --- a/tests/auto/quick/scenegraph/CMakeLists.txt +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -4,11 +4,15 @@ ## tst_scenegraph Test: ##################################################################### +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + qt_internal_add_test(tst_scenegraph SOURCES tst_scenegraph.cpp - DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -16,6 +20,7 @@ qt_internal_add_test(tst_scenegraph Qt::QmlPrivate Qt::QuickPrivate Qt::QuickTestUtilsPrivate + TESTDATA ${test_data} ) #### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>: |