Commit Graph

413 Commits

Author SHA1 Message Date
Christian Stenger
a149c52e99 SquishTests: Start expecting Python kits
Python kits will be new in QC13. Do not let the squish tests
fail in case it stumbles over one.

Change-Id: Ic0af56f49321f6d5800d11398d2e73b21c25e51a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-11-29 08:23:40 +00:00
Robert Löhning
b77b12c97b SquishTests: Restore lines removed from projecttrees
Partially reverts 3970a834bc
and 5bce234986

Change-Id: Iaf05f4c19e16b4e0d817350d4121ad371b8b1661
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-26 19:18:05 +00:00
Christian Stenger
7459fb0c75 SquishTests: Tweak the handling of special clang
When expecting the clang from llvm used to build QC we
nowadays have to resolve symbolc links.

Change-Id: I54cfecc15d77f244eccd81d5cdd14ec7297e1eeb
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-13 10:07:25 +00:00
Christian Stenger
f01c4c4055 SquishTests: Adapt to changed wizard
Test projects have moved to their own category.

Change-Id: If69aecffd19f40a3d24be1b88970f9cc0045272a
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-29 12:20:25 +00:00
Christian Stenger
23828a1d9c SquishTests: Adapt to changed behavior
We nowadays use pragma once by default for include guards.
Enhance former check to be able to check for both later on.

Change-Id: I0955158f53e056fed2e3751cf42f51855ff95515
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-29 09:09:21 +00:00
Christian Stenger
f2451f8cd3 SquishTests: Improve lldb expectations
LLDB provides a couple of executables that are not usable as
standalone debugger - explicitly filter them out.

Change-Id: I293479adb6b47b1a63e6cad5a9d1ab34e255d9ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-28 12:30:01 +00:00
Jarek Kobus
5bce234986 Valgrind: Refactor Parser
Make it implicitly threaded.

Get rid of ThreadedParser.

Don't move QTcpSocket instances, received by
QTcpServer::nextPendingConnection(), into another thread,
as docs says it's not safe.

Use wait condition for waiting for new data.

Don't potentially leak the Parser in loadXmlLogFile():
store a unique pointer to the running parser.

Introduce Parser::setData() method and use it with
QFile device in loadXmlLogFile().

Pass QAbstractSocket into the parser instead of
QIODevice and get rid of downcasting. The QIODevice
couldn't really work with non-socket and non-file devices
(like e.g. QProcess), as it lacks general error and finished
reporting signals (it has only general readyRead() signal).

Change-Id: I9352aec694564d4d2a26898841ed964bed470d82
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-08-14 14:42:16 +00:00
Jarek Kobus
3970a834bc Valgrind: Replace global toolTipForFrame() with Frame::toolTip()
Change-Id: I66cc481d588c468b9388e3b3863ed35aab406fa2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-08 15:10:47 +00:00
Robert Löhning
178b490997 SquishTests: Adapt test of navigation tree
Extends b57f72e3c8 to another test.

Change-Id: I419ce4fb05667fd22a1e913ef7122b191e12a34a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-28 12:34:36 +00:00
Robert Löhning
b95aba56b5 SquishTests: Don't use lists of dicts
...when that doesn't have any advantages.

Change-Id: I0c58e30ae0b9e278e3336646332279f6243719d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-27 11:52:25 +00:00
Christian Stenger
b57f72e3c8 SquishTests: Adapt test of navigation tree
Explicitly disable loading ClangCodeModel plugin to avoid slowing
down the load and parse of the projects by the indexer as we are
measuring the time for these.
Beside this adapt the expected tree for macOS - there are a couple
of files and subtrees that are present only conditionally.

Change-Id: Ibc000d0908e652700820f8eee4b17effdf48f637
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-27 11:48:26 +00:00
Robert Löhning
a521114519 SquishTests: Don't initialize an entire list for reading one item
The point of Python3 returning objects instead of lists is that
it will iterate just as far as items are actually being used.

Change-Id: If4d9742bb47aa9cac1166a0ff6f10d211829fd85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-27 11:41:40 +00:00
Christian Stenger
488f1b3d11 SquishTests: Adapt cmake based speedcrunch test
Change-Id: Ic4c22311828f2c0364cbc514b98d2cb4e7d1b86a
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-27 10:29:43 +00:00
Christian Stenger
6614abe549 SquishTests: Adapt to Python 3
A dict's values object is not a list as it had been in Python 2.
Explicitly convert it.

Change-Id: Iab54a5833b77c6890b108065657da3ff73c96f7f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-19 08:57:08 +00:00
Christian Stenger
e5acc8b072 SquishTests: Fix verification of debugger detection
There are now generic debuggers registered - adapt the test accordingly.

Change-Id: I102ac0ac44666c4da17ff6ea01f048abba66e6e7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-07-07 04:28:25 +00:00
Robert Löhning
0a4e671ab8 SquishTests: Update session dialog
Change-Id: I76919f48e2301c1815eaac39f81e42fa12f59a86
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-06 10:56:28 +00:00
Robert Löhning
997570cb29 SquishTests: Update kit removal function
The names of the kits don't change anymore before clicking "Apply".

Change-Id: I1477b419053f75c4f761561808fc4c6e5d21b19d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-06 10:44:58 +00:00
Robert Löhning
c654e389c6 SquishTests: Update repository of Creator's sources to v6.0.1
6.0.1 was released on Qt 6.2 and was the last
version which could be built on Qt 5.14.

How I got to this:
0. Verify on Linux that the test passes with qbs 2.0.2
   from Creator 10 to have a combination which is known
   to work correctly.
1. Upgrade sources to v6.0.1 and write the tree which
   qbs 2.0.2 and Creator 11 generated from those.
2. Run the test with qbs 2.1.0 and Creator 11 and update
   the expected tree. This only meant removing a couple
   of lines.
3. Verify on Windows that the test passes with qbs 2.0.2
   from Creator 10 to have a combination which is known
   to work correctly.
4. Upgrade sources to v6.0.1 and write the tree which
   qbs 2.0.2 and Creator 11 generated from those. Remove
   all lines from the expected tree which were not found.
   Most of those contained forward slashes instead of
   backslashes.
5. Verify that the result passes with qbs 2.1.0 and
   Creator 11

Change-Id: I41579feb719324cf1fc605c73fe1d7566cf82202
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-03 14:08:17 +00:00
Robert Löhning
015b2f14fb SquishTests: Update expected tree of tst_opencreator_qbs
Disclaimer: I don't know why all those lines disappeared from the
tree. I only removed the lines which are not being found anymore
and updated a few more.

Change-Id: I916362247022b2ea84f5fa4255c6df6585311271
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-03 14:07:17 +00:00
Robert Löhning
eab484717b SquishTests: Configure Creator's sources on Qt 5.14
Change-Id: I973a34e16630050a500db70986a653c102a79da2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-03 14:04:58 +00:00
Robert Löhning
0960156ada SquishTests: Fetch speedcrunch as needed
Change-Id: I4a2103bc58ae7ccdf4d728627f0346af40e6266e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-29 14:04:32 +00:00
Eike Ziller
68915713bf Merge remote-tracking branch 'origin/10.0' into tr
Conflicts:
	src/shared/qbs
	tests/system/suite_general/tst_opencreator_qbs/test.py

Change-Id: I683ebb489e7c2112b343bb3631f6343fdc84cc4a
2023-06-15 09:43:24 +02:00
Robert Löhning
f939f19b9d SquishTests: Update tst_opencreator_qbs for Python3
Change-Id: If0e03204c49e80eb2bfca6e0d14413aad9d790f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-08 13:44:44 +00:00
Robert Löhning
a9720c1183 SquishTests: Don't generate tasks with empty description
Creator ignores them anyway.

Task-number: QTCREATORBUG-29209
Change-Id: I0ab2f96d55547ccf3112b18886518a065b19052a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:55:50 +00:00
Robert Löhning
de104fad12 SquishTests: Don't try changing build system of Quick Apps
They can use CMake only.

Change-Id: Ibbce50290597594a98ae08d9dd7ab171137c2b7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:42:49 +00:00
Robert Löhning
83c837049d SquishTests: Make number of results constant in verifyKitCheckboxes()
Before the change, we got zero results in the
expected case or up to two fails on error.

Change-Id: I6583844eb5473cad8190acc91db1207933dc6630
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:41:20 +00:00
Robert Löhning
37b30dc7a2 SquishTests: Remove workaround for fixed inconsistency
Task-number: QTCREATORBUG-29126
Change-Id: I2a84e606249d5ca7f68d7a73d819eee3f341216d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:40:59 +00:00
Robert Löhning
58fb6f88a6 SquishTests: Update reading build issues
Fixes tst_build_new_project, tst_CCOM02 et al.

tst_tasks_handling fails which might be an actual issue, reported in:

Task-number: QTCREATORBUG-29209
Change-Id: I5eae54df27d8ba8f441e5b9c4acdaa2b41716245
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-31 12:04:15 +00:00
Robert Löhning
e719a2b47a SquishTests: Update tst_create_proj_wizard
Change-Id: Id17f5d1a68da7fe7c9f45dc5b62ab3fe1039f753
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-15 14:13:41 +00:00
Robert Löhning
94c9e6cbac SquishTests: Add possible location of cdb
Change-Id: I72c3f1b5bdcceeca2764d4a77229c45655187376
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-21 11:44:20 +00:00
Christian Stenger
cf8f23e8e0 SquishTests: Fix wrong usage
Amends 476f67cce5.

Change-Id: I584a059b52515bf625a973fff43485f5b52e6061
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-04-14 05:06:28 +00:00
Robert Löhning
5c5e12981e SquishTests: Add an explanation about automatically created kits
Change-Id: I1bb351c56600fa4a6e420299bdbaff1c436d19c9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 09:23:39 +00:00
Christian Stenger
0c6b3b3747 Squish: Fix expected compilers on Windows
Compilers will be nowadays displayed with full version.
VS 2019 and 2022 are out for a long time and have been added.
Ensure installed official LLVM is detected correctly.

Change-Id: Ica29dca74cb8e08bafda1a88fcd2c2a6150bb236
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-31 06:12:49 +00:00
Christian Stenger
3ad00fc871 SquishTests: More Python3 adaption
Change-Id: I95488e2b5661c8790cb73246947af58de2a1899b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-29 15:17:24 +00:00
Christian Stenger
ac4aaf5e23 SquishTests: Some Python3 adaption
Makes some tests succeed and lets a couple of tests get further
on macOS.

Change-Id: I9a3f124c094e67f51748ddae47d00897fe5259d5
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-03-27 04:36:30 +00:00
Christian Stenger
3a7ab3ce8e SquishTests: Rename helper class
Change-Id: I39890cbd98b7e6ebcc0fdf4722d0311eb6650397
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-23 12:50:56 +00:00
Christian Stenger
2d79718ad4 SquishTests: Adapt to changed wizard template
Change-Id: I7e487481ede88d186fb868d595eb96f25afc2fc5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-21 06:23:43 +00:00
Christian Stenger
5c7eb717ed SquishTests: Adapt to changed wizard
Change-Id: I07d3b468e6b5ec4055fa57efcddaa0cdb678966b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-21 06:23:14 +00:00
Eike Ziller
d278135497 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I8d73198561f6ff7877d580681ca2a0018b7dc3b1
2023-02-06 10:14:18 +01:00
Christian Stenger
476f67cce5 SquishTests: Fix default settings test
Depending on the presence of the llvm that had been used when building
QC we need to expect its clang.
Use special environment variable to be able to do this correctly.

Change-Id: I2497bbd96483f37aa90842d7fffa5d0a8103ff45
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-02-01 14:42:05 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Robert Löhning
80885d12e0 SquishTests: Update tst_installed_languages
Change-Id: Ic06b6241df913ebcfe685936f3c509875a2897bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-15 06:45:00 +00:00
Robert Löhning
c72a93599d Squish-Tests: Use QTC_DO_NOT_PROPAGATE_LD_PRELOAD
This is a reaction to an change in Creator's handling
of environment variables. Creator now passes on
LD_PRELOAD set by Squish. This results in build errors
and crashes of started applications.

Change-Id: I39cf21c60a474d7453e9c29fd3eaf32d3f0d6806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 19:20:07 +00:00
Robert Löhning
2acc90a0ba SquishTests: Update tst_create_proj_wizard
Change-Id: I652f2504d1e13ae8c93429a99d31d3754bd57298
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-24 10:04:00 +00:00
Robert Löhning
86f87605f9 SessionDialog: SquishTests: Update tst_session_handling
Change-Id: I6fcdb6173c39715e85f4cf37d12e7707b2e5d066
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-24 10:03:22 +00:00
Christian Stenger
9f0dcd71c4 Squish: Adapt to ui changes
Change-Id: Ie7cb2a80a5edfa135a1b5d1b44c365a5e6cf408b
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-10-13 13:08:05 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Christian Stenger
450f4abe74 Squish: Adapt to changed ui
...and modified minimum requirements inside wizards.

Change-Id: I32d2dea0dc0ccff273ebf32f5aa713829330eb01
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:51:21 +00:00
Christian Stenger
7103432404 Squish: Do not expect clang shipped by QC anymore
Change-Id: I2f09835bde52aa2f0cd90def7f6d8d628736ff56
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-06-30 08:03:11 +00:00
Robert Löhning
0c2e1cf094 Squish: Update location of Options dialog
Change-Id: Ie9df4f897621520744998c3dbd9a3c44600ba844
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-28 10:13:34 +00:00