diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-16 11:08:34 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-08-16 16:46:02 +0200 |
commit | e661b07a1ef910be9b9591078c73a38e3127bc12 (patch) | |
tree | d6034b387778880e266e2bf4e9c7937f2d633b13 | |
parent | 3ca78e5a9a6b7c52e885cfcb666ecabe8076f0da (diff) |
tst_restart: add -nocrashhandler option for ServerRestartFatal mode
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 <qt_ci_bot@qt-project.org>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 02adc13564fdddfff6d01729136365b0778515f9)
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
-rw-r--r-- | tests/auto/restart/tst/tst_restart.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 |