From e8f93e38debf4f46dbda4de198b9dd475df42d5c Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Mon, 15 Nov 2021 13:36:48 +0100 Subject: Rename and restructure the baseline (lancelot) testing code In preparation for addition of new baseline tests, establish a new test category, "baseline". This is similar to the category "benchmarks" in that it contains tests that use the QTest framework, but conceptually are not unit tests, in contrast to those under auto/. Move the existing QPainter baseline test, tst_lancelot, into this new category, and rename it accordingly. Baseline tests use the QBaselineTest extension to QTest. Move that extension too into the tests/baseline directory, allowing the clean out of the baselineserver directory. Pick-to: 6.2 Change-Id: I1b527f5867c953b1d22be73798fcf7d1494712ea Reviewed-by: Qt CI Bot Reviewed-by: Eirik Aavitsland Reviewed-by: Volker Hilsheimer --- tests/manual/lance/CMakeLists.txt | 64 +++++++++++++++++++-------------------- tests/manual/lance/lance.pro | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index 02b7273be4..edf2faa929 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -6,13 +6,13 @@ qt_internal_add_manual_test(lance SOURCES - ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/paintcommands.h + ../../baseline/painting/paintcommands.cpp ../../baseline/painting/paintcommands.h interactivewidget.cpp interactivewidget.h main.cpp widgets.h INCLUDE_DIRECTORIES . - ../../auto/other/lancelot + ../../baseline/painting PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui @@ -35,41 +35,41 @@ qt_internal_add_resource(lance "icons" ${icons_resource_files} ) set(images_resource_files - "../../auto/other/lancelot/images/alpha.png" - "../../auto/other/lancelot/images/alpha2x2.png" - "../../auto/other/lancelot/images/bitmap.png" - "../../auto/other/lancelot/images/border.png" - "../../auto/other/lancelot/images/borderimage.png" - "../../auto/other/lancelot/images/dome_argb32.png" - "../../auto/other/lancelot/images/dome_indexed.png" - "../../auto/other/lancelot/images/dome_indexed_mask.png" - "../../auto/other/lancelot/images/dome_mono.png" - "../../auto/other/lancelot/images/dome_mono_128.png" - "../../auto/other/lancelot/images/dome_mono_palette.png" - "../../auto/other/lancelot/images/dome_rgb32.png" - "../../auto/other/lancelot/images/dot.png" - "../../auto/other/lancelot/images/face.png" - "../../auto/other/lancelot/images/gam030.png" - "../../auto/other/lancelot/images/gam045.png" - "../../auto/other/lancelot/images/gam056.png" - "../../auto/other/lancelot/images/gam100.png" - "../../auto/other/lancelot/images/gam200.png" - "../../auto/other/lancelot/images/image.png" - "../../auto/other/lancelot/images/mask.png" - "../../auto/other/lancelot/images/mask_100.png" - "../../auto/other/lancelot/images/masked.png" - "../../auto/other/lancelot/images/sign.png" - "../../auto/other/lancelot/images/solid.png" - "../../auto/other/lancelot/images/solid2x2.png" - "../../auto/other/lancelot/images/struct-image-01.jpg" - "../../auto/other/lancelot/images/struct-image-01.png" - "../../auto/other/lancelot/images/zebra.png" + "../../baseline/painting/images/alpha.png" + "../../baseline/painting/images/alpha2x2.png" + "../../baseline/painting/images/bitmap.png" + "../../baseline/painting/images/border.png" + "../../baseline/painting/images/borderimage.png" + "../../baseline/painting/images/dome_argb32.png" + "../../baseline/painting/images/dome_indexed.png" + "../../baseline/painting/images/dome_indexed_mask.png" + "../../baseline/painting/images/dome_mono.png" + "../../baseline/painting/images/dome_mono_128.png" + "../../baseline/painting/images/dome_mono_palette.png" + "../../baseline/painting/images/dome_rgb32.png" + "../../baseline/painting/images/dot.png" + "../../baseline/painting/images/face.png" + "../../baseline/painting/images/gam030.png" + "../../baseline/painting/images/gam045.png" + "../../baseline/painting/images/gam056.png" + "../../baseline/painting/images/gam100.png" + "../../baseline/painting/images/gam200.png" + "../../baseline/painting/images/image.png" + "../../baseline/painting/images/mask.png" + "../../baseline/painting/images/mask_100.png" + "../../baseline/painting/images/masked.png" + "../../baseline/painting/images/sign.png" + "../../baseline/painting/images/solid.png" + "../../baseline/painting/images/solid2x2.png" + "../../baseline/painting/images/struct-image-01.jpg" + "../../baseline/painting/images/struct-image-01.png" + "../../baseline/painting/images/zebra.png" ) qt_internal_add_resource(lance "images" PREFIX "/" BASE - "../../auto/other/lancelot" + "../../baseline/painting" FILES ${images_resource_files} ) diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index 4437cb4539..f6c6210998 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -1,4 +1,4 @@ -LANCELOT_DIR = $$PWD/../../auto/other/lancelot +LANCELOT_DIR = $$PWD/../../baseline/painting CONFIG += cmdline moc TEMPLATE = app INCLUDEPATH += . $$LANCELOT_DIR -- cgit v1.2.3