diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-16 15:14:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-17 14:53:06 +0000 |
| commit | 7c45b035b97ce705d536932965673dca7cfa489e (patch) | |
| tree | 9f01149708036c367af0df464c352bef2bebcb3b /tests/auto | |
| parent | 82117639970aa6e2a850a21d082aaab130e59778 (diff) | |
Make sure QQmlDebugProcess correctly reports session as started
If the "Waiting" output appears before we wait, the event loop could run
forever. Also, the timeout of 5s was too low. We increase it to 15s.
Remove the blacklists and other workarounds in turn.
Task-number: QTQAINFRA-1334
Change-Id: Ib1032a8e57ab8dada3e56163ebab1523a7357aeb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto')
7 files changed, 4 insertions, 15 deletions
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/BLACKLIST b/tests/auto/qml/debugger/qdebugmessageservice/BLACKLIST deleted file mode 100644 index 5fb1dc193b..0000000000 --- a/tests/auto/qml/debugger/qdebugmessageservice/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -# QTQAINFRA-1334 -windows gcc diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/BLACKLIST b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/BLACKLIST deleted file mode 100644 index 5fb1dc193b..0000000000 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -# QTQAINFRA-1334 -windows gcc diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/BLACKLIST b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/BLACKLIST deleted file mode 100644 index 5fb1dc193b..0000000000 --- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -# QTQAINFRA-1334 -windows gcc diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/BLACKLIST b/tests/auto/qml/debugger/qqmlenginecontrol/BLACKLIST deleted file mode 100644 index 5fb1dc193b..0000000000 --- a/tests/auto/qml/debugger/qqmlenginecontrol/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -# QTQAINFRA-1334 -windows gcc diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp index 738da048a3..aba9eb39ab 100644 --- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp @@ -102,10 +102,6 @@ QmlDebugObjectReference tst_QQmlEngineDebugInspectorIntegration::findRootObject( void tst_QQmlEngineDebugInspectorIntegration::init(bool restrictServices) { -#if defined(Q_OS_WIN) && defined(Q_CC_MINGW) - QSKIP("Capturing output while running nested event loop is not reliable on Windows/GCC"); -#endif - const QString argument = QString::fromLatin1("-qmljsdebugger=port:%1,%2,block%3") .arg(STR_PORT_FROM).arg(STR_PORT_TO) .arg(restrictServices ? QStringLiteral(",services:QmlDebugger,QmlInspector") : diff --git a/tests/auto/qml/debugger/qqmlinspector/BLACKLIST b/tests/auto/qml/debugger/qqmlinspector/BLACKLIST deleted file mode 100644 index 5fb1dc193b..0000000000 --- a/tests/auto/qml/debugger/qqmlinspector/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -# QTQAINFRA-1334 -windows gcc diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp index 7b9e935678..d31efc84cf 100644 --- a/tests/auto/qml/debugger/shared/debugutil.cpp +++ b/tests/auto/qml/debugger/shared/debugutil.cpp @@ -126,7 +126,7 @@ QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent) { m_process.setProcessChannelMode(QProcess::MergedChannels); m_timer.setSingleShot(true); - m_timer.setInterval(5000); + m_timer.setInterval(15000); connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput())); connect(&m_process, SIGNAL(errorOccurred(QProcess::ProcessError)), this, SLOT(processError(QProcess::ProcessError))); @@ -208,7 +208,10 @@ bool QQmlDebugProcess::waitForSessionStart() if (m_process.state() != QProcess::Running) { qWarning() << "Could not start up " << m_executable; return false; + } else if (m_started) { + return true; } + m_eventLoop.exec(); return m_started; |