diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-11-15 13:36:48 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-11-16 14:01:50 +0100 |
| commit | e8f93e38debf4f46dbda4de198b9dd475df42d5c (patch) | |
| tree | c042e1fea11d2b63788f1b8855030ecd96e13c19 /tests/benchmarks/gui | |
| parent | 9a131b59ee561e300fb6078886a85dd7b3c53599 (diff) | |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/benchmarks/gui')
| -rw-r--r-- | tests/benchmarks/gui/painting/lancebench/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index e278f0ddc0..f417bcc61a 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -6,8 +6,10 @@ qt_internal_add_benchmark(tst_bench_lancebench SOURCES - ../../../../auto/other/lancelot/paintcommands.cpp ../../../../auto/other/lancelot/paintcommands.h + ../../../../baseline/painting/paintcommands.cpp ../../../../baseline/painting/paintcommands.h tst_lancebench.cpp + INCLUDE_DIRECTORIES + ../../../../baseline/painting PUBLIC_LIBRARIES Qt::Gui Qt::GuiPrivate @@ -47,13 +49,13 @@ set(images_resource_files "images/zebra.png" ) -list(TRANSFORM images_resource_files PREPEND "../../../../auto/other/lancelot/") +list(TRANSFORM images_resource_files PREPEND "../../../../baseline/painting/") qt_internal_add_resource(tst_bench_lancebench "images" PREFIX "/" BASE - "../../../../auto/other/lancelot" + "../../../../baseline/painting" FILES ${images_resource_files} ) @@ -61,7 +63,7 @@ qt_internal_add_resource(tst_bench_lancebench "images" #### Keys ignored in scope 1:.:.:lancebench.pro:<TRUE>: # TEMPLATE = "app" -# TESTDATA = "../../../../auto/other/lancelot/scripts/*" +# TESTDATA = "../../../../baseline/painting/scripts/*" ## Scopes: ##################################################################### diff --git a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp index 418f0623b3..b6f7d693b9 100644 --- a/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp +++ b/tests/benchmarks/gui/painting/lancebench/tst_lancebench.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include "../../../../auto/other/lancelot/paintcommands.h" +#include "paintcommands.h" #include <qtest.h> #include <QDir> |