Commit Graph

75 Commits

Author SHA1 Message Date
Robert Löhning
e2d0ec02fe SquishTests: Don't expect Creator to detect 32 bit cdbs
It stopped using them in Version 14.

Change-Id: I81c481d48474ae6024187b876720026ed668575c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-22 11:20:53 +00:00
Robert Löhning
0de1a6cdf7 SquishTests: Don't expect qmake in tst_default_settings
When qmake is not present in PATH or not usable, Creator does not add
a Qt version and does not write qtversion.xml. Expect this behavior
in the test.

Change-Id: I0890b9a22bdec47c0ac7206ba0a83d1e3ded2bb3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-22 07:10:15 +00:00
Christian Stenger
3b7d9178ae SquishTests: Fix default settings test
QC nowadays provides lldb on Windows which gets automatically
registered.
Beside this correct expectations for the compiler based on the
LLVM path that had been used for building the QC package and
might be the same on the machine the test runs on.

Change-Id: Ie9553b79bb0eb0012386bd71422005c184638046
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2024-03-26 07:06:43 +00:00
Eike Ziller
3e40f227f5 Merge remote-tracking branch 'origin/12.0'
Change-Id: I70bcac4195095a7646dcdc31532d8f61b643d869
2024-01-10 16:06:29 +01:00
Robert Löhning
72c0ff37fc SquishTests: Expect symlinked compilers
e.g. /usr/bin/clang links to ../lib/llvm-14/bin/clang
on Ubuntu 22.04.

Change-Id: I6facd3126045036124e6c79ee83bc7575cbb02d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-01-09 13:33:12 +00:00
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
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
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
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
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
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
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
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
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
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
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
Robert Löhning
7a8ca55f77 Squish: Introduce helper function for checking for strings
In Python3 type unicode is unavailable since it's implicit with "str".
The new functions helps porting code.

Change-Id: I5de0fa182acbbaf267ed51f66f658cb9c884f4c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 11:00:35 +00:00
Eike Ziller
62011851ae Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: Ie467c5d63420041a9acffeb4a726130988ec0f41
2021-03-18 09:29:51 +01:00
Christian Stenger
da53e3f994 Squish: Allow automatically created kits
Linking to Qt makes the respective configured kits become
auto detected and these have a fixed Qt.
The Qt version combo box for these kits is disabled on the
Kits page, so be more relaxed when checking kits page.

Change-Id: Ieb7e22b47bd5e5c5603e85dc0ddf2421427e85d6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:11:26 +00:00
Robert Löhning
2ec094b419 Squish: Prepare for clang > 9
Change-Id: I4cf6e8be63568d56388b0cf87ae692735bf4c113
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-15 09:53:55 +00:00
Christian Stenger
5311f8c20f Squish: Fix compiler detection
Find clang and clang++ in more than one location. If they could
be found in more than a single path provided inside PATH we
expected only the first occurrence.

Change-Id: Ibcd7b7b6dff1153fd4b52b055c0fb2a0c5d9d7fc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-12-04 06:28:45 +00:00
Robert Loehning
e425d88b6b Squish: Update clang detection in tst_default_settings
Change-Id: Ia1e0332253a309eae9579fff5cae2659a6089c50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-30 13:29:05 +00:00
Robert Loehning
4cfcdc65a5 Squish: Use parameters in another call to mouseClick(...)
Reverts e8727fcae2 for this line.

Change-Id: I6ac752985fb9bcb66a38d7f97d8cc8dc33da4189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-30 13:28:43 +00:00
Christian Stenger
e8727fcae2 Squish: Clean up single (left) mouse clicks on items or objects
Do no more use pixels as offset if we can handle this without.
Clicking on items by using an (x, y) offset will likely fail if
running on a machine with a different DPI setting.

Change-Id: I0e5a4985104bd1d68aadf8c5534583fa1b048edb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-07-25 12:06:05 +00:00
Robert Loehning
d27f7c675e ProjectExplorer: Make varsBatCombos Squish-testable again
Change-Id: I4656800f80022652f9277029c597754c9263bf66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-24 15:47:28 +00:00
Robert Loehning
a5821ae06d Squish: Fix crash in tst_default_settings
On Windows, compilers of type "Clang" display a QComboBox instead of a QLabel

Change-Id: I68537259d8d5b38b288308675139c92395f6df62
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-18 11:32:21 +00:00
Christian Stenger
bff51f9e2a Squish: Fix default settings test
QC ships a valid usable clang that gets detected as compiler.

Change-Id: Iddf94ed6c563367289a1f5418ab222e14c05f81c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-12-13 16:42:43 +00:00
Robert Loehning
e48436d7c5 Squish: Expect some more compilers
Change-Id: I00dcd2334ff8d545450e923c28fcc6cf4efd570a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-12-13 10:33:05 +00:00
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-09-05 09:24:18 +00:00
Robert Loehning
2c6a57be9c Squish: Move imports of "os", "re" and "sys" into shared class
Change-Id: I349cb255b8fa6f96e32d5dacb3c9b58ddeb76897
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-07 09:25:05 +00:00
Robert Loehning
ff10f8c3a5 Squish: Fix warnings
Warnings from static code checks, that is, not test.warning() at runtime.

Change-Id: I651d13491106583908059ecdb5f700f539b6d9c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-06 14:21:30 +00:00
Robert Loehning
2a3bfea8a9 Squish: Update for changed Options dialog
Change-Id: I823e88e80a00079dbf0a2cbdfd72973d44001063
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-01 09:25:16 +00:00
Christian Stenger
8771054060 Squish: Check also for expected clang on macOS
Change-Id: I32d7f5ebf02a559ca854553536874c6ec68f0ec5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-17 04:55:48 +00:00
Christian Stenger
38d307ffb8 Squish: Adapt test to improved compiler detection
QC now finds some more compilers.

Change-Id: Icbf8d29a24c3360d2d7d8ed73011f705dd156aa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-19 10:28:56 +00:00
Christian Stenger
eb4b4d7be2 Squish: Fix iterating over debuggers
Change-Id: I6648e74f8f8e0c581a4bd4ba4b3606e3f18a5af5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-10 12:16:24 +00:00
Robert Loehning
69df8ec321 Squish: Add those from Windows 10 kit to expected debuggers
Change-Id: I5281fa5dc126a7cf1ea84592f735cb11d908b82d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-06 07:07:42 +00:00
Christian Stenger
9b09bf62bd Squish: Fix tst_default_settings
QC now supports C compilers as well, adjust the test to reflect this.

Change-Id: I20f2264b31c1f21384b463beccbc27ab1073083c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-11-07 10:12:52 +00:00
Robert Loehning
c1e7cf84e4 Squish: Do not use shell in getOutputFromCmdline
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-30 09:13:04 +00:00
Christian Stenger
b1e9290b73 Squish: Raise some timeouts a bit...
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 05:08:23 +00:00
Christian Stenger
532cd88dd7 Squish: MSVC2015 and Build Tools are supported...
...so, expect them if they are present.

Change-Id: I333bba81717d44431857a543540e5599e2de7fed
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-15 12:08:58 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 16:01:06 +00:00
Robert Loehning
e94de191b0 Squish: Update objects of Qt version settings
Change-Id: I2fce4d860a70230519d7f56e58d88a03dbb379ba
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-30 10:46:24 +00:00
Robert Loehning
e087ed2452 Squish: Fix tst_default_settings
Change-Id: I136d93e7b698dcda5388bc24b9bcaaae482fb861
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-21 11:01:43 +00:00