Commit Graph

8097 Commits

Author SHA1 Message Date
Jarek Kobus
127ca236a7 Ensure we never encounter the message about destroying QProcess
Until we remove the process launcher / process reaper.

Change-Id: I9c68c40c3c856c0a515277b69fc3084ba2addbee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-24 09:42:07 +00:00
Christian Stenger
c1b585933b Squish: Fix remove kits test
cmake is automatically running when re-opening a project
and creates a temporary kit which was different when using qmake.
Switch back to qmake and enhance later to support cmake as well.

Change-Id: Id3e1dc23c828a6e2af5454863e1349d9866dfa38
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:16 +00:00
Christian Stenger
fcddfe5a8c Squish: Fix project wizard test
Change-Id: Iabf4463ac535cab025db3ee808e61f5fe7054095
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:08 +00:00
Christian Stenger
e7f314e02a Squish: Fix local git test
The test was written for a qmake based project. Explicitly use
one as default build system has changed.

Change-Id: Iccf5761915708dd66ba73aeda25ca6b61a8c0b99
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-23 13:44:28 +00:00
Eike Ziller
ae6c974fb2 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
2022-03-23 14:16:07 +01:00
Robert Löhning
5b0b48177b Squish: Port tst_WELP03 to Python3
Change-Id: I997fb8cc44fab986b5f4e0aa6e6f1f92fccfd54a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-23 13:14:18 +00:00
Jarek Kobus
ae49fb213b Ensure that after a call to waitForFinished() process is not running
Amends 5de5f1cf0a

Change-Id: I64db8c6736c6a7cc6805813f852faf1048ebb629
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-23 12:12:39 +00:00
Christian Stenger
34b94d8cd2 Squish: Update Welcome page test
Change-Id: I447addcba50e932886a8ed5e730a1eab663a2224
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-23 05:37:42 +00:00
Jarek Kobus
5de5f1cf0a QtcProcess: Add a test for crashing app
Ensure that when waitForFinished() didn't timeout
but the process has terminated, it returns true,
like QProcess does, in contrary to what QProcess'
documentation says.

Change-Id: I6af5034f4df7fc2e14a83bab74334a8abefe7a0f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-22 11:30:24 +00:00
Christian Stenger
f69de8b5bc Tests: Fix compile
Amends 47bcb63854.

Change-Id: I34a867b3b0b868933937e37e8268b98078aa3023
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-21 07:59:19 +00:00
Robert Löhning
a2735ec024 Squish: Don't configure projects on Qt4 anymore
Change-Id: Ib09fc44323e09fa4d6a5d2428c35b5b6afe08f24
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 18:27:32 +00:00
Jarek Kobus
dabe2e1493 ProcessLauncher: Don't emit error twice on process crash
Behave the same as QProcess in this circumstances.

Change-Id: If8175ccb7102d6a561584ee73c2e5c5844f2770d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-18 15:19:35 +00:00
Eike Ziller
b6f679d777 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/webassembly/webassemblytoolchain.cpp

Change-Id: Ia75c783e3ecab1f97de2b5c73a0979c49da82009
2022-03-18 16:07:51 +01:00
Christian Stenger
4e47ed66c9 Squish: Fix qml indentation test
Adapt to default build system change.

Change-Id: I70b5869871d4fbb612d4b6a28beb5e73c2d8d88e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 14:39:56 +00:00
Christian Stenger
de1a328390 Squish: Fix debugging console app test
Change-Id: I752dab65948952081752a805018cfc3b01193855
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 14:39:49 +00:00
Robert Löhning
48c3a02229 Squish: Update suite_QMLS
Change-Id: I2cf804362b965be77ff0cd6686c998664e6eee02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 12:57:08 +00:00
Robert Löhning
59c32bcfbe Squish: Don't use Qt4 in tst_HELP04 anymore
Change-Id: Idebff8b0bfd75daf573ab870dedd984eac9d09d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 12:56:31 +00:00
Christian Stenger
cc885348c7 Squish: Adapt to ui change
Change-Id: I0c896d5fa6d8fd814afec3206a2faae434da9dc7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 11:31:54 +00:00
Robert Löhning
689d3d528e Squish: Update tst_CSUP01 and -02
Change-Id: I6e15545be1a92e43b5708dc5fdef456b8d2ab32d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 10:02:00 +00:00
Jarek Kobus
47bcb63854 Add new types of blocking processes
Change-Id: I7668d0ac94a4e949f7ea67d8a1c0c144af5bd541
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 09:35:44 +00:00
Eike Ziller
e914f42458 Merge remote-tracking branch 'origin/7.0'
Change-Id: I9c4ef46084fd392663c7c21c4ecdbc578ea28577
2022-03-18 08:42:02 +01:00
Robert Löhning
ab772c50be Squish: Update tst_cmake_speedcrunch
Change-Id: I46ab6f245a21546e6ebf20680f06b0cdd26eab8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-17 21:35:44 +00:00
Eike Ziller
9fd2a059f6 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/android/androiddevice.cpp
	src/plugins/docker/dockerdevice.cpp

Change-Id: Id16ba0d9993c9f608242622aceae0a2a6691e05e
2022-03-17 08:48:28 +01:00
Christian Stenger
a42b63ac05 Squish: Build speedcrunch with Qt5
Change-Id: I1fe79d6775b157fda26248917c9489edca88fd53
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-17 05:27:13 +00:00
Christian Stenger
66c5b1e11e RemoteLinux: Avoid unexpected password dialog in tests
Make the test depend on environment variables and give some
hint how to run the test correctly.
Beside this make the test work on Windows and share the setup
with ssh unit test.

Change-Id: I6bbf1ec863449512646ca2c51d13fec537beedbc
Reviewed-by: hjk <hjk@qt.io>
2022-03-16 16:44:27 +00:00
Christian Stenger
f43348c4f2 Squish: More corrections due to change of default build system
Change-Id: Ia221e1e84784f5218d14258fcc24dcac900d60ad
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-16 12:56:43 +00:00
hjk
42d7a96a67 Docker: Add some example for boot2qt kit setup
Change-Id: Ib4dfc474eee19d7e0f66bf5a76cd6c808df15efc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-03-16 12:51:42 +00:00
Christian Stenger
d24f13d66d Squish: Adapt to changes ui text
Change-Id: I03187ddecb7a5737a87a626135584458795aa633
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-16 05:18:18 +00:00
Christian Stenger
2907d60973 Squish: Handle build systems more appropriately
Change-Id: I43e89d76c4199a741a5606dd0d6de2165b8133c6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-16 05:18:10 +00:00
Robert Löhning
82534fc979 Squish: Explicitly use qmake-based projects in suite_APTW
Creator's default build system is CMake now which broke the tests.

Change-Id: I901b44dd4545a297d0100da5d92aa1bea79e41d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-15 08:24:20 +00:00
Assam Boudjelthia
e5ce9e9e76 Android: Get rid of the avd info fields in AndroidDeviceInfo
The AVD specific fields don't need to be carried out by QtC settings,
these can be read from the AVD's config file when they are needed.

This also is good because those values can change at any time,
either manually or by some other IDE like Android Studio, and thus
we don't really need to manage them ourselves.

The fields in question are: skin name, target name, sdcard size,
openGL status.

Change-Id: I86163500ec2fed035e32ec02ed17e182778db4a7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-14 17:47:55 +00:00
Jarek Kobus
67497e6bc4 Compile fix
Amends cfe8b7ad88

Change-Id: I4a570c481cf631ee6650a5c9d3b0f0540df88671
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-14 09:41:42 +00:00
Jarek Kobus
cfe8b7ad88 Fix handling of unfinished lines by QtcProcess callbacks
Don't detect a call to QtcProcess::kill() from inside the
QtcProcess callback while awaiting inside QtcProcess::waitFor...().
That's not needed, since a call to kill() sends a stop message
to the process launcher, so we wait for confirmation
from process launcher instead. This may bring e.g. new
read data from the running process.

Fix a runBlockingStdOut() test so that when we write to the stdOut
from the running process we flush the unfinished line so that
it's not buffered inside the process.

Change-Id: I7944ac214d8cb9e10a71715a7ef8bfacab6df7c9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-14 07:38:08 +00:00
Eike Ziller
cd8c4ced81 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
2022-03-11 09:50:48 +01:00
Alessandro Portale
a863958aa4 Utils: Silence MSVC deprecation warnings in tst_qtcprocess
warning: C4996: 'setmode': The POSIX name for this item is deprecated.
Instead, use the ISO C and C++ conformant name: _setmode. See online
help for details.

...same for 'fileno'

Change-Id: I85090b65532b17b535914b88de835d718f654f6a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-03-11 08:04:35 +00:00
Jarek Kobus
b2331dd5f6 Fix paths to subprocesses when test is run from other directory
Now it's possible to run the test outside of directory
where the test is located.

Change-Id: I2a2c693d382917ac7b84488c8ccf161538b58238
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-10 10:27:29 +00:00
Jarek Kobus
e66bd6ed90 Simplify starting subCreator process even more
Use SUB_CREATOR_PROCESS macro for registering subprocess'
main() function.

Invoke registered subprocesses by a call to
invokeSubProcessIfRequired().

Substitute subTestCase env variables with TestCase subclasses.
This should make the code even more readable.

Amends bbb0270fb1

Change-Id: Id63b15841ea539f367dab4972a6ecbb298d277e7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-10 08:42:56 +00:00
Christian Stenger
ced2b9c4c0 Tests: Fix build
Amends a7f867ab06.

Change-Id: I5854228fce2d4537305535c332a1a39b21619f62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-10 07:38:30 +00:00
Christian Stenger
a09c5baedb Tests: Fix expected assert on Windows
Paths are os specific in this context.

Change-Id: Ida8f7a661ca005d0b624f4ce75727df420f51e9b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-03-09 15:22:29 +00:00
Jarek Kobus
bbb0270fb1 Simplify starting subCreator process
Introduce SubCreatorConfig class that helps setting up
a Creator subprocess. This limits the code repetition.

Introduce SUB_CREATOR_PROCESS(subProcess) macro to easily define
environment variables referred to Creator subprocesses.
This macro also forward declares the subProcessMain()
function.

Match names of main subprocess functions with their
corresponding environment variables.

Group subProcessMain() functions near the corresponding
test function for clarity.

Change-Id: Ib4365cf18fddc1527ebc99accee1fbb974bbf7a1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-09 12:17:14 +00:00
Samuel Ghinet
a61f7db1ea Fix: Recents don't show up for Custom presets
In the New Project dialog for QDS, if the user had created a project
from a User-defined (i.e. Custom) preset, this preset did not appear
under the Recents tab.

Task-number: QDS-4989
Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-09 10:55:49 +00:00
Jarek Kobus
809b371108 Fix tst_qtcprocess when Qt is showing warnings on startup
In my case Qt is persistently showing the following warning
at startup of every application:

Warning: Ignoring WAYLAND_DISPLAY on Gnome.
Use QT_QPA_PLATFORM=wayland to run on Wayland anyway.

There is no easy solution here, as even when I run this test
with -platform xcb option, then this test is running
another instance of Creator that doesn't have this option
passed. Since QTest's internal main function parses the
argv options and filters out those recognized by Qt itself,
calling QCoreApplication::arguments() doesn't return
the originally passed -platform xcb option.

The solution here is simple - we ignore initial lines
in callback (so we filter out the initial warnings
generated by Qt) and wait for first expected line.
The final check of parsed line numbers should prevent
the case when we have filtered out all the lines.

Change-Id: Ideff0dc7c409b6e3ad81ec13577cb67e5211d5df
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-09 10:49:53 +00:00
Jarek Kobus
a7f867ab06 Fix a path to process launcher in tst_qtcprocess
Change-Id: I1de71ff51ffdcc02a2ec8dd117a26625514cd309
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-09 09:29:06 +00:00
Samuel Ghinet
618eda3572 Implement custom presets
Task-number: QDS-4989
Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-08 09:39:43 +00:00
Robert Löhning
50199cab93 Squish: Fix checkLastBuild() with python3
Change-Id: I25c02f91eab4a7cbf784ab726e0fe24210050a84
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-03 20:02:26 +00:00
Jarek Kobus
8e0ae8ba96 QtcProcess: Limit the inclusion of qtcprocess.h
Move the rest of QtcProcess enums to processenums.h.
Move ExitCodeInterpreter into processenums.h.
Remove superfluous Utils:: prefix.

Change-Id: Iaa596f353d33d6930085a621b114cc15a35caa80
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-02 13:30:39 +00:00
Jarek Kobus
53095f666f SshRemoteProcessRunner: Unify API
Make the API more similar to QtcProcess API.
Rename signals to started() and finished().

Change-Id: I01f3a148749b666b8f145d8769222a234ccc9bce
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-02 09:52:47 +00:00
Jarek Kobus
d3c1632a0f SshRemoteProcessRunner: Unify API
Make the API more similar to QtcProcess API.
Drop process prefix for getters.

Change-Id: I21b99bb5b11956d923c0e526c08bbea9686e5c95
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-02 09:52:09 +00:00
Robert Löhning
a763f5d689 Squish: Port tst_SCOM04 to CMake
Change-Id: I71f8978a41b25b2ed5fffaac1be6ff77cb3099f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-01 12:26:13 +00:00
Christian Stenger
869ad16d04 Squish: Remove outdated condition
Change-Id: I89029f50cc0a303111f9960eac3f3c17b4c05fb0
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-01 08:54:43 +00:00