From 58b46d65e8c55e194c6fd92a6783c0947dd42c7b Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 9 Jun 2022 20:16:26 +0200 Subject: tst_restart: increase waiting timeout in test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Targeting to 6.4 directly, as this is a release blocker. Will pick to 6.2 and 5.15 manually. Fixes: QTBUG-104098 Change-Id: I4c452cd7a5b36a54e4fcc52afecbb930be9827f1 Reviewed-by: Mårten Nordheim (cherry picked from commit 0f6ec405cf7d4dcc1adf4c8947d78417de69a5ee) --- tests/auto/restart/client/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3 From 3ca78e5a9a6b7c52e885cfcb666ecabe8076f0da Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 15 Jun 2022 20:09:33 +0300 Subject: Bump version --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From e661b07a1ef910be9b9591078c73a38e3127bc12 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Tue, 16 Aug 2022 11:08:34 +0200 Subject: tst_restart: add -nocrashhandler option for ServerRestartFatal mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In ServerRestartFatal mode the server is expected to crash, so add the -nocrashhandler to disable the crash handler. It seems like on macOS 10.14 it causes the server process to hang on exit. Fixes: QTBUG-105597 Change-Id: I8bf2446b4964a8c5dfaa8edb562b8943116b8989 Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim (cherry picked from commit 02adc13564fdddfff6d01729136365b0778515f9) Reviewed-by: Brett Stottlemyer --- tests/auto/restart/tst/tst_restart.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3