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

Valgrind: Fix test failures

Browse Source 
Change-Id: I4b8b69ecdf537f38d062dc62cf6c91ce92edcd8a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-07-27 13:51:20 +02:00
parent 3d718d3dae
commit 8469886ab8
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/valgrind/valgrindtestrunnertest.cpp
View File

@@ -408,7 +408,11 @@ void ValgrindTestRunnerTest::testUninit2()
"manually before executing this test.");
const QString srcDir = srcDirForApp(app);
QVERIFY(m_logMessages.isEmpty());
QVERIFY(m_logMessages.size() < 2);
if (!m_logMessages.isEmpty()) {
QVERIFY2(m_logMessages.first().contains("If you believe"),
m_logMessages.first().constData());
}
QCOMPARE(m_errors.count(), 2);
//BEGIN first error
@@ -475,7 +479,11 @@ void ValgrindTestRunnerTest::testUninit3()
"manually before executing this test.");
const QString srcDir = srcDirForApp(app);
QVERIFY(m_logMessages.isEmpty());
QVERIFY(m_logMessages.size() < 2);
if (!m_logMessages.isEmpty()) {
QVERIFY2(m_logMessages.first().contains("If you believe"),
m_logMessages.first().constData());
}
QCOMPARE(m_errors.count(), 2);
//BEGIN first error
@@ -617,7 +625,7 @@ void ValgrindTestRunnerTest::testFree1()
{
const Frame frame = stack.frames().constFirst();
QCOMPARE(frame.functionName(), QString("operator delete(void*)"));
QVERIFY2(frame.functionName().contains("operator delete"), qPrintable(frame.functionName()));
}
{
const Frame frame = stack.frames().constLast();
@@ -637,7 +645,7 @@ void ValgrindTestRunnerTest::testFree1()
{
const Frame frame = stack.frames().constFirst();
QCOMPARE(frame.functionName(), QString("operator delete(void*)"));
QVERIFY2(frame.functionName().contains("operator delete"), qPrintable(frame.functionName()));
}
{
const Frame frame = stack.frames().constLast();
@@ -753,7 +761,10 @@ void ValgrindTestRunnerTest::testOverlap()
QVERIFY(m_logMessages.isEmpty());
QCOMPARE(m_errors.count(), 1);
QVERIFY(m_errors.count() <= 1);
if (m_errors.isEmpty())
QSKIP("Some libc implementations automatically use memmove in case of an overlap.");
const Error error = m_errors.first();
QCOMPARE(error.kind(), int(Overlap));
QCOMPARE(error.stacks().count(), 1);