diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-06 10:16:28 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-19 07:38:36 +0000 |
| commit | 5100d558742c682d83e0d4033d78ed4c9f521f56 (patch) | |
| tree | 664bd70bfa195adc00461f862ee3d724ea3f6268 | |
| parent | 7f3204ea7ba7836907b2d3eeefc51912c1c8c54b (diff) | |
QQmlDebugProcess: Wait forever for debug messages
If we don't get the expected message in 15s, output a warning and try
again. This will eventually be terminated by the overall test watchdog,
but experiments show that starting processes on the CI can take minutes,
so it's not worth it to have a separate timeout here. We still output
the warning, so that we see in the log when this happens.
Task-number: QTBUG-68741
Change-Id: I1ca9d0726753d566d8d89dd682d7d503fcd3a337
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | tests/auto/qml/debugger/shared/qqmldebugprocess.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp b/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp index 201a6b1a76..f2b85833c9 100644 --- a/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp +++ b/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp @@ -41,7 +41,6 @@ QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent) , m_receivedBindErrors(0) { m_process.setProcessChannelMode(QProcess::MergedChannels); - m_timer.setSingleShot(true); m_timer.setInterval(15000); connect(&m_process, &QProcess::readyReadStandardOutput, this, &QQmlDebugProcess::processAppOutput); @@ -127,7 +126,6 @@ void QQmlDebugProcess::timeout() qWarning() << "Timeout while waiting for QML debugging messages " "in application output. Process is in state" << m_process.state() << ", Output:" << m_output << "."; - m_eventLoop.quit(); } bool QQmlDebugProcess::waitForSessionStart() |