diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:09 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:09:09 +0300 |
| commit | bdc316aca82769b43cb7821c10d80a1ca02b846e (patch) | |
| tree | e14b693d389128dbd5acecdbffc185de5cd2c94d | |
| parent | d10e7673218fa2b00191a82ad20cd3304a711fa6 (diff) | |
| parent | e661b07a1ef910be9b9591078c73a38e3127bc12 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: I72731dbbe2bd555bd93ad1c97d1322d5c704baba
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/restart/client/main.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/restart/tst/tst_restart.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index a85c301..0450e29 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,6 +4,6 @@ CONFIG += qt_example_installs DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.15.10 +MODULE_VERSION = 5.15.11 QTRO_SOURCE_TREE = $$PWD diff --git a/tests/auto/restart/client/main.cpp b/tests/auto/restart/client/main.cpp index c520131..b4a30a9 100644 --- a/tests/auto/restart/client/main.cpp +++ b/tests/auto/restart/client/main.cpp @@ -78,7 +78,7 @@ private Q_SLOTS: QVERIFY(reply.waitForFinished()); QSignalSpy advanceSpy(m_rep.data(), SIGNAL(advance())); - QVERIFY(advanceSpy.wait()); + QVERIFY(advanceSpy.wait(15000)); if (objectMode == QLatin1String("ObjectPointer")) { QVERIFY(m_rep->subClass() != nullptr); QCOMPARE(m_rep->subClass()->myPOD(), initialValue); diff --git a/tests/auto/restart/tst/tst_restart.cpp b/tests/auto/restart/tst/tst_restart.cpp index 6e7c8ed..5b56905 100644 --- a/tests/auto/restart/tst/tst_restart.cpp +++ b/tests/auto/restart/tst/tst_restart.cpp @@ -96,9 +96,12 @@ private slots: env.insert("RunMode", QVariant::fromValue(runMode).toString()); env.insert("ObjectMode", QVariant::fromValue(objectMode).toString()); serverProc.setProcessEnvironment(env); + QStringList arguments; + if (runMode == ServerRestartFatal) + arguments.append("-nocrashhandler"); serverProc.start(findExecutable("restart_server", { QCoreApplication::applicationDirPath() + "/../server/" - }), QStringList()); + }), arguments); QVERIFY(serverProc.waitForStarted()); // wait for server start |