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 12:55:48 +0200 |
| commit | 02adc13564fdddfff6d01729136365b0778515f9 (patch) | |
| tree | 102b950718a4f3bdc27ecb1b365eba9d1965a47c /tests | |
| parent | acd888220b9d600fe057249d43bd3934ae0cbad5 (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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/restart/tst/tst_restart.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/restart/tst/tst_restart.cpp b/tests/auto/restart/tst/tst_restart.cpp index c58f42a..f36c82f 100644 --- a/tests/auto/restart/tst/tst_restart.cpp +++ b/tests/auto/restart/tst/tst_restart.cpp @@ -61,8 +61,10 @@ private slots: env.insert("RunMode", QVariant::fromValue(runMode).toString()); env.insert("ObjectMode", QVariant::fromValue(objectMode).toString()); serverProc.setProcessEnvironment(env); - serverProc.start(TestUtils::findExecutable("restart_server", "/server"), - QStringList()); + QStringList arguments; + if (runMode == ServerRestartFatal) + arguments.append("-nocrashhandler"); + serverProc.start(TestUtils::findExecutable("restart_server", "/server"), arguments); QVERIFY(serverProc.waitForStarted()); // wait for server start |