Commit Graph

10247 Commits

Author SHA1 Message Date
Alexandru Croitor
36abcc7cbe Regenerate tests/auto/opengl
Change-Id: I9bd417ae02db1b6827e09baab301152f3614da80
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:11:48 +00:00
Alexandru Croitor
8305b6fe3f Regenerate tests/auto/dbus
Change-Id: I105eb73065e02a4fa508d17f481047b32875f128
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:11:39 +00:00
Alexandru Croitor
0650bafa59 Regenerate tests/auto/concurrent
Change-Id: I6a291f7dd70f78c5cafb6d96a1c0d57ed7223c8b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:59 +00:00
Alexandru Croitor
0d62567f0b Regenerate tests/auto/network/ssl
Change-Id: Ib05f4e3c8dea934ce48776fdd50305f7c98c1adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:48 +00:00
Alexandru Croitor
164d8c35b3 Regenerate tests/auto/network/socket
Change-Id: I653f7f4a6e3421f56f873cfbec4309eca49f1756
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:36 +00:00
Alexandru Croitor
ee5db96ef7 Regenerate tests/auto/network/bearer
Change-Id: I57526fa99376708203fb1723f3b85243925a1273
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:24 +00:00
Alexandru Croitor
5acc32361e Regenerate tests/auto/network/access
Change-Id: I18839ef583336fa2fa42cb4325fdb007675df213
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:12 +00:00
Alexandru Croitor
dec6b7cb9e Regenerate tests/auto/network/kernel
Change-Id: I770fce0f0a369204178ea0dfa7bbd8b210dd3585
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:07:02 +00:00
Alexandru Croitor
3909923958 Regenerate tests/auto/widgets/util
Change-Id: Icda122f04c8857f237e822d3981befb78885309b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:52 +00:00
Alexandru Croitor
af72e13636 Regenerate tests/auto/widgets/graphicsview
Change-Id: I2e6a8f2f92e9cb8d6bb0be53068dfd43ba87db4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:43 +00:00
Alexandru Croitor
3f5adb4653 Regenerate tests/auto/widgets/itemviews
Change-Id: Ia95c89cde7faf5d3edb69cc8969bda2becd7b51d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:34 +00:00
Alexandru Croitor
5c549fba30 Regenerate tests/auto/widgets/styles
Change-Id: I8c9a63d0ac33465db832f01e1dd84abbea66fb30
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:25 +00:00
Alexandru Croitor
a678d9fb62 Regenerate tests/auto/widgets/kernel
Change-Id: Ib611ea32623e44c58432a15c73626aab36ab2b98
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:16 +00:00
Alexandru Croitor
02278007cb Regenerate tests/auto/widgets/effects
Change-Id: Ib31f764202635198b5cdf236ba19982bb3b18cbb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:06:06 +00:00
Alexandru Croitor
8801d499d0 Regenerate tests/auto/widgets/dialogs
Change-Id: Ief296935d274bfaa217442890927593f0875271a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:56 +00:00
Alexandru Croitor
52d9b2234c Regenerate tests/auto/widgets/widgets
Change-Id: I9d9360612931b29b5d13a224236ef650dc5c8e1d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:47 +00:00
Alexandru Croitor
bfbf3e0b3a Regenerate rest of tests/auto/gui
Change-Id: Iaaea50790161715517f7a4085116d5c893fa286b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:37 +00:00
Alexandru Croitor
3377978122 Regenerate tests/auto/gui/math3d
Change-Id: I7579ed464ec9211b1da7478c02e4e13a2a71277a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:27 +00:00
Alexandru Croitor
4936b6c795 Regenerate tests/auto/gui/kernel
Change-Id: I32046f33612f9b306dd889a0d42aa70d32375531
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:15 +00:00
Alexandru Croitor
43d7927004 Regenerate tests/auto/gui/painting
Change-Id: Id30f9e7e6cadb4a09c669c5688c01a84300a8c41
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:05:06 +00:00
Alexandru Croitor
cd258ca28a Regenerate tests/auto/gui/image
Change-Id: If6aa42d5b19227e488fc2fcf94b8eacc02c2c209
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-13 10:04:49 +00:00
Alexandru Croitor
b0a223cf08 Regenerate tests/auto/corelib/statemachine
Change-Id: I9b9dcb0ede68116033bcde69cc1b5fafb67a22d1
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-12 17:27:21 +00:00
Alexandru Croitor
2718f5928e Regenerate tests/auto/corelib/serialization
Change-Id: Id2e221e4018b46467203c8d6f29a9758c3c57a60
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:59 +00:00
Alexandru Croitor
5c1bb8e4d4 Regenerate tests/auto/corelib/codecs
Change-Id: Iea71e497e8bcf131ed89c9e576381dc305b1dd44
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:41 +00:00
Alexandru Croitor
8076afb3c6 Regenerate tests/auto/corelib/tools
Change-Id: I1ea8fbf509c7e6d556ebd974fcff9084bc668e17
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:27 +00:00
Alexandru Croitor
5447ccd469 Regenerate tests/auto/corelib/mimetypes
Change-Id: Id137b8e9f48edd65c4df901f11a8ae917395d6b6
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:15 +00:00
Alexandru Croitor
7adcdcbf80 Regenerate tests/auto/corelib/text
Change-Id: I34e24b7c2697bcdddc628855e2b539b8db1b98b0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:26:05 +00:00
Alexandru Croitor
f7d7021460 Regenerate tests/auto/tools
Change-Id: I25268499ff966ebf134150accbaec7634726fe40
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:41 +00:00
Alexandru Croitor
209c7238a7 Regenerate tests/auto/corelib/thread
Change-Id: Ib70f000480ffbbb994edd80d9e2c7f5d9e270e0c
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:29 +00:00
Alexandru Croitor
d802572f0b Regenerate tests/auto/corelib/animation
Change-Id: I698e8bf965cc928bf7f48f44c81bd0dc017f483c
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:18 +00:00
Alexandru Croitor
d58d7ebfea Regenerate tests/auto/corelib/kernel
Change-Id: I466387408d26854e11fde0a1fbef74c2fad764c7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:25:04 +00:00
Alexandru Croitor
812d45ed09 Regenerate tests/auto/corelib/global
Change-Id: I89a82f0cafeda2f38217a24f1c495344910fba1a
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:24:56 +00:00
Alexandru Croitor
76590ce220 Regenerate tests/auto/corelib/io
Change-Id: Ic1d1b5c0deb90800c7219fb8cce4e77e0db145b8
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-12 17:24:44 +00:00
Leander Beernaert
2285dd6f10 Rename some more manual test to be unique
This patch renames some of the manual test by prefixing them with
tst_manual_ to make sure they are unique in the project structure. This
is a requirement for the CMake port.

Change-Id: I83e2152826e0f95c3378374ab1c9992412022109
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 63a1a30a01)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-12 10:35:39 +00:00
Leander Beernaert
70a218b90b Fix compile errors related to missing Qt:: namespace
Change-Id: I092a26ef38b08c52d84adb027a1b1bdee8cc7f6b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit ce187c4f0e)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-12 10:35:26 +00:00
Leander Beernaert
190021b9c7 Rename some manual test to be unique
This patch renames some of the manual test by prefixing them with
tst_manual_ to make sure they are unique in the project structure. This
is a requirement for the CMake port.

Change-Id: Ie393b125ce5a35b7069cf006db0f3af8c4fda5b4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 937e014e63)
2019-11-12 10:28:40 +00:00
Leander Beernaert
2199a50a2a Build test/manual if it contains a CMakeLists.txt
Change-Id: Ibada60b0902f9c6a6a7284489a56106e0021a9de
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-12 10:06:46 +00:00
Alexandru Croitor
de3a806def Make standalone tests build via top level repo project
Previously repo/tests/CMakeLists.txt was a standalone project on which
CMake could be called. This was useful for Coin to be able to build
and package only tests, but was a bit troublesome because that means
having to specify the usual boilerplate like minimum CMake version,
which packages to find in every tests.pro project.

Instead of having a separate standalone project, modify the top level
project and associated CMake code to allow passing a special
QT_BUILD_STANDALONE_TESTS variable, which causes the top level project
to build only tests, and find Qt in the previously installed qt
location.

This also means that when building a repo, we generate a
${repo_name}TestsConfig.cmake file which does find_package on all the
modules that have been built as part of that repo. So that when
standalone tests bare built for that repo, the modules are
automatically found.

qt_set_up_standalone_tests_build() is modified to be a no-op because
it is not needed anymore. Its usage should be removed from all the
other repos, and then removed from qtbase.

Non-adjusted tests/CMakeLists.txt projects in other repositories
should still be buildable with the current code, until they are updated
to the new format.

Adjust the Coin build instructions to build the standalone tests in a
separate directory.

Adjust pro2cmake to generate new structure for the tests/tests.pro
projects.

Adjust the qtbase tests project.

Fixes: QTBUG-79239
Change-Id: Ib4b66bc772d8876cdcbae1e90ce5a5a5234fa675
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-08 15:42:32 +00:00
Alexandru Croitor
c51fe841f4 Fix handling of _nolink targets for the QtNetwork module
When a _nolink target is exported, instead of getting the original
namespace prefix, it gets the Qt6 prefix
(OpenSSL::OpenSSL_nolink -> Qt6::OpenSSL_nolink).

There is some special case code in Network autotests which tries
to access the former target name, which doesn't exist when building
standalone tests.

Make sure to create a Qt6:: library alias for _nolink targets during a
build (so before the library is exported), and change the Network
autotests project to use this Qt6:: namespaced library, which will
ensure it is found both in a standalone tests build and in a regular
Qt build.

Also make sure to actually call find_package to find the OpenSSL
library when building standalone tests, otherwise configuration will
fail.

Change-Id: I3da5b958e72e745a50380f8ab1644459a7c6b005
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-08 15:09:54 +00:00
Leander Beernaert
344e4ec827 Convert remaining tests/benchmarks
Change-Id: Ie7d49d4dc5bf6b2345b54f6bdfffcd974123f729
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-04 15:48:51 +00:00
Leander Beernaert
56115dba42 Convert remaining gui utils tests
Fixes:QTBUG-78229

Change-Id: I3bff1b562e1c146f291e5692c90d2c38f162d395
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-04 13:36:46 +00:00
Frederik Gladhorn
e7118bd7fd cmake: add tests/auto/gui/text
Fixes: QTBUG-78228
Change-Id: I3d4666a553e94de47e01d64551b8fe672994b137
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-01 13:28:59 +00:00
Frederik Gladhorn
8931f4fe5f cmake: fix tests/auto/gui/kernel/qguieventloop
The include does not join the required libraries. When building the
tests in a separate build directory this works for some reason (that's
why the CI doesn't catch it). Building everything top level breaks
though.

Considering this happens in maybe two places, I'm not sure it's worth
the effort of fixing the porting scripts.

Change-Id: I104ab9717257cbe8dfd5112dffd0d0b002cdb09e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-11-01 13:01:21 +00:00
Frederik Gladhorn
48c56a992e cmake: re-generate auto/gui/kernel/qguieventloop
The target naming has been fixed, it used to be taken from the include,
but now that we added the real tst_qeventloop we have a name clash.

All that's needed to fix the situation is regeneration of this cmake list.

Change-Id: Id336906f30494dfa92cf5e2812f8b1a8771a992f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-01 08:50:45 +00:00
Frederik Gladhorn
045bb3df92 cmake: add gui/kernel tests
Fixes: QTBUG-78224
Change-Id: I9e6294b5035b066dead0f5ff91f81e472bc56d62
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-31 09:49:30 +00:00
Frederik Gladhorn
79c384ebb0 cmake: add widgets/kernel tests
Fixes: QTBUG-78230
Change-Id: Ia59f531f92e1f8499a8e814ff48c36f65984ff2a
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-31 09:49:03 +00:00
Leander Beernaert
0cab837fd7 Convert tests/auto/other
Change-Id: I79ba4f6bbbbede8ddab278dd987d9ad98277a229
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-28 12:19:50 +00:00
Leander Beernaert
b0aee08ff6 Convert qvulkan test
Change-Id: I395fa1c08bb67d65604962883dce3b390c604b9c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-28 12:05:17 +00:00
Leander Beernaert
c3de886b61 Port qopengl and qopenglconfig tests
Change-Id: Ic3b61fb7f23cb884552126038d0bdf289d0cbc6a
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-28 12:04:59 +00:00
Leander Beernaert
1fa03ced47 Port rhi tests
Change-Id: I3bf5731696a0647bf0e62758eb3d1742ba097041
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-28 12:04:46 +00:00