From af559bf837916bf657799eab07f257b945525c5c Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Wed, 16 Jan 2013 12:40:29 +0100 Subject: [PATCH] tests/valgrind: fixing compilation - convert directly to QString to add to a QTest row and to qMakePair - add missing ssh.pri dependency Change-Id: I819ccfa901f993507d5e449fc68d4317ffa1cebb Reviewed-by: hjk --- tests/valgrind/callgrind/callgrindparsertests.pro | 1 + tests/valgrind/memcheck/modeldemo.pro | 1 + tests/valgrind/memcheck/parsertests.cpp | 15 ++++++++------- tests/valgrind/memcheck/parsertests.pro | 1 + tests/valgrind/memcheck/testrunner.pro | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/valgrind/callgrind/callgrindparsertests.pro b/tests/valgrind/callgrind/callgrindparsertests.pro index 39b25046c4e..99ccfb9bd0d 100644 --- a/tests/valgrind/callgrind/callgrindparsertests.pro +++ b/tests/valgrind/callgrind/callgrindparsertests.pro @@ -1,6 +1,7 @@ include(../../auto/qttest.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/ssh/ssh.pri) TARGET = callgrindparsertests DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/valgrind/memcheck/modeldemo.pro index e002f36542d..eb843efdf7d 100644 --- a/tests/valgrind/memcheck/modeldemo.pro +++ b/tests/valgrind/memcheck/modeldemo.pro @@ -2,6 +2,7 @@ include(../../../qtcreator.pri) include(../../auto/qttestrpath.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/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TEMPLATE = app diff --git a/tests/valgrind/memcheck/parsertests.cpp b/tests/valgrind/memcheck/parsertests.cpp index cc4e0a936a8..03c3d83b431 100644 --- a/tests/valgrind/memcheck/parsertests.cpp +++ b/tests/valgrind/memcheck/parsertests.cpp @@ -282,9 +282,9 @@ void ParserTests::testMemcheckSample1() expectedErrorCounts.push_back(QPair(9, 2)); QVector > expectedSuppCounts; - expectedSuppCounts.push_back(qMakePair(QLatin1String("X on SUSE11 writev uninit padding"), static_cast(12))); - expectedSuppCounts.push_back(qMakePair(QLatin1String("dl-hack3-cond-1"), static_cast(2))); - expectedSuppCounts.push_back(qMakePair(QLatin1String("glibc-2.5.x-on-SUSE-10.2-(PPC)-2a"), static_cast(2))); + expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("X on SUSE11 writev uninit padding"), static_cast(12))); + expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("dl-hack3-cond-1"), static_cast(2))); + expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("glibc-2.5.x-on-SUSE-10.2-(PPC)-2a"), static_cast(2))); Valgrind::XmlProtocol::Parser parser; Recorder rec(&parser); @@ -472,13 +472,14 @@ void ParserTests::testValgrindStartError_data() QTest::addColumn("debuggee"); QTest::addColumn("debuggeeArgs"); - QTest::newRow("invalid_client") << QLatin1String("valgrind") << QStringList() - << QLatin1String("please-dont-let-this-app-exist") << QString(); + QTest::newRow("invalid_client") << QString::fromLatin1("valgrind") << QStringList() + << 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(); - 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(); } diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/valgrind/memcheck/parsertests.pro index 3170210d381..e58578dabe3 100644 --- a/tests/valgrind/memcheck/parsertests.pro +++ b/tests/valgrind/memcheck/parsertests.pro @@ -1,5 +1,6 @@ include(../../auto/qttest.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/plugins/valgrind/valgrind_test.pri) diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/valgrind/memcheck/testrunner.pro index 53035bbac7a..fea9eebd00b 100644 --- a/tests/valgrind/memcheck/testrunner.pro +++ b/tests/valgrind/memcheck/testrunner.pro @@ -1,6 +1,7 @@ include(../../auto/qttest.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/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TARGET = testrunner