feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Ignore messages in local runner test

Browse Source 
Depending on the build configuration of Qt and Qt Creator there can
be various kinds of messages and we cannot reliably determine their
number in advance.

Change-Id: I162cc02a72200026d3cbe7498fa705911f4cda39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Ulf Hermann
2016-07-25 13:27:22 +02:00
parent 1acec7ceb4
commit 8067297edf
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmlprofiler/tests/localqmlprofilerrunner_test.cpp
View File

@@ -37,17 +37,6 @@ LocalQmlProfilerRunnerTest::LocalQmlProfilerRunnerTest(QObject *parent) : QObjec
{
}
bool checkErrors(const QStringList &errors, int number)
{
if (errors.length() != number) {
qDebug() << "Found unexpected errors:" << errors;
return false;
} else {
return true;
}
}
void LocalQmlProfilerRunnerTest::testRunner()
{
Debugger::AnalyzerConnection connection;
@@ -64,7 +53,6 @@ void LocalQmlProfilerRunnerTest::testRunner()
bool running = false;
int runCount = 0;
QStringList errors;
auto connectRunner = [&]() {
connect(runner, &LocalQmlProfilerRunner::started, this, [&running, &runCount](){
@@ -76,13 +64,6 @@ void LocalQmlProfilerRunnerTest::testRunner()
QVERIFY(running);
running = false;
});
connect(runner, &LocalQmlProfilerRunner::appendMessage, this,
[&errors](const QString &message, Utils::OutputFormat format) {
if (format == Utils::ErrorMessageFormat && message !=
ProjectExplorer::ApplicationLauncher::msgWinCannotRetrieveDebuggingOutput())
errors << message;
});
};
connectRunner();
@@ -91,7 +72,6 @@ void LocalQmlProfilerRunnerTest::testRunner()
QTRY_COMPARE_WITH_TIMEOUT(runCount, 1, 10000);
QTRY_VERIFY_WITH_TIMEOUT(!running, 10000);
QVERIFY(checkErrors(errors, 1));
configuration.socket = connection.analyzerSocket = LocalQmlProfilerRunner::findFreeSocket();
configuration.debuggee.executable = qApp->applicationFilePath();
@@ -109,7 +89,6 @@ void LocalQmlProfilerRunnerTest::testRunner()
QTRY_COMPARE_WITH_TIMEOUT(runCount, 2, 10000);
QTRY_VERIFY_WITH_TIMEOUT(!running, 10000);
QVERIFY(checkErrors(errors, 1));
delete rc;
@@ -128,11 +107,9 @@ void LocalQmlProfilerRunnerTest::testRunner()
QTRY_COMPARE_WITH_TIMEOUT(runCount, 3, 10000);
QTest::qWait(1000);
QVERIFY(running); // verify it doesn't spontaneously stop
QVERIFY(checkErrors(errors, 1));
rc->stop();
QTRY_VERIFY_WITH_TIMEOUT(!running, 10000);
QVERIFY(checkErrors(errors, 2)); // "The program has unexpectedly finished."
delete rc;
}