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

tests/valgrind: fixing compilation

Browse Source 
- convert directly to QString to add to a QTest row and to qMakePair
 - add missing ssh.pri dependency

Change-Id: I819ccfa901f993507d5e449fc68d4317ffa1cebb
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Fawzi Mohamed
2013-01-16 12:40:29 +01:00
committed by hjk
parent 42c16ff7d3
commit af559bf837
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/valgrind/callgrind/callgrindparsertests.pro
View File

@@ -1,6 +1,7 @@
include(../../auto/qttest.pri) include(../../auto/qttest.pri)
include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
TARGET = callgrindparsertests TARGET = callgrindparsertests
DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""

1
tests/valgrind/memcheck/modeldemo.pro
View File

@@ -2,6 +2,7 @@ include(../../../qtcreator.pri)
include(../../auto/qttestrpath.pri) include(../../auto/qttestrpath.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
TEMPLATE = app TEMPLATE = app

15
tests/valgrind/memcheck/parsertests.cpp
View File

@@ -282,9 +282,9 @@ void ParserTests::testMemcheckSample1()
expectedErrorCounts.push_back(QPair<qint64,qint64>(9, 2)); expectedErrorCounts.push_back(QPair<qint64,qint64>(9, 2));
QVector<QPair<QString,qint64> > expectedSuppCounts; QVector<QPair<QString,qint64> > expectedSuppCounts;
expectedSuppCounts.push_back(qMakePair(QLatin1String("X on SUSE11 writev uninit padding"), static_cast<qint64>(12))); expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("X on SUSE11 writev uninit padding"), static_cast<qint64>(12)));
expectedSuppCounts.push_back(qMakePair(QLatin1String("dl-hack3-cond-1"), static_cast<qint64>(2))); expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("dl-hack3-cond-1"), static_cast<qint64>(2)));
expectedSuppCounts.push_back(qMakePair(QLatin1String("glibc-2.5.x-on-SUSE-10.2-(PPC)-2a"), static_cast<qint64>(2))); expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("glibc-2.5.x-on-SUSE-10.2-(PPC)-2a"), static_cast<qint64>(2)));
Valgrind::XmlProtocol::Parser parser; Valgrind::XmlProtocol::Parser parser;
Recorder rec(&parser); Recorder rec(&parser);
@@ -472,13 +472,14 @@ void ParserTests::testValgrindStartError_data()
QTest::addColumn<QString>("debuggee"); QTest::addColumn<QString>("debuggee");
QTest::addColumn<QString>("debuggeeArgs"); QTest::addColumn<QString>("debuggeeArgs");
QTest::newRow("invalid_client") << QLatin1String("valgrind") << QStringList() QTest::newRow("invalid_client") << QString::fromLatin1("valgrind") << QStringList()
<< QLatin1String("please-dont-let-this-app-exist") << QString(); << QString::fromLatin1("please-dont-let-this-app-exist") << QString();
QTest::newRow("invalid_valgrind") << QLatin1String("valgrind-that-does-not-exist") << QStringList() QTest::newRow("invalid_valgrind") << QString::fromLatin1("valgrind-that-does-not-exist") << QStringList()
<< fakeValgrindExecutable() << QString(); << fakeValgrindExecutable() << QString();
QTest::newRow("invalid_valgrind_args") << QLatin1String("valgrind") << (QStringList() << "--foobar-fail") QTest::newRow("invalid_valgrind_args") << QString::fromLatin1("valgrind")
<< (QStringList() << QString::fromLatin1("--foobar-fail"))
<< fakeValgrindExecutable() << QString(); << fakeValgrindExecutable() << QString();
} }

1
tests/valgrind/memcheck/parsertests.pro
View File

@@ -1,5 +1,6 @@
include(../../auto/qttest.pri) include(../../auto/qttest.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)

1
tests/valgrind/memcheck/testrunner.pro
View File

@@ -1,6 +1,7 @@
include(../../auto/qttest.pri) include(../../auto/qttest.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
TARGET = testrunner TARGET = testrunner