From 1353ac64cf542dcd0b174e2e77e9c37d86fcba39 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 17 Oct 2019 14:55:44 +0300 Subject: Add test for cpp.generateLinkerMapFile property This test cover only the applications using the MSVC and GCC-like toolchains yet. Other toolchains and a product types can be added later if it will required. Change-Id: I37db96015774447e1e30b503d9853599be0177f2 Reviewed-by: Christian Kandeler --- tests/auto/blackbox/tst_blackbox.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests/auto/blackbox/tst_blackbox.cpp') diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index f65d462d2..d04ed91d8 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6615,6 +6615,25 @@ void TestBlackbox::generatedArtifactAsInputToDynamicRule() QVERIFY2(!m_qbsStdout.contains("generating"), m_qbsStdout.constData()); } +void TestBlackbox::generateLinkerMapFile() +{ + QDir::setCurrent(testDataDir + "/generate-linker-map-file"); + QCOMPARE(runQbs(), 0); + const bool isUsed = m_qbsStdout.contains("use test: true"); + const bool isNotUsed = m_qbsStdout.contains("use test: false"); + QVERIFY(isUsed != isNotUsed); + if (isUsed) { + QVERIFY(QFile::exists(relativeProductBuildDir("app-map") + + "/app-map.map")); + QVERIFY(!QFile::exists(relativeProductBuildDir("app-nomap") + + "/app-nomap.map")); + QVERIFY(!QFile::exists(relativeProductBuildDir("app-nomap-default") + + "/app-nomap-default.map")); + } else { + QSKIP("Unsupported toolchain. Skipping."); + } +} + void TestBlackbox::generator() { QFETCH(QString, inputFile); -- cgit v1.2.1 From 8c8fb4b0638f0cb41c8d546f78c5f3702edeb3a5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 23 Oct 2019 15:03:14 +0200 Subject: Fix qbsSession autotest It failed with mingw on Windows. Change-Id: Ia5cc3b4590ea184106cee6119b9670138ad5fb07 Reviewed-by: Joerg Bornemann --- tests/auto/blackbox/tst_blackbox.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/blackbox/tst_blackbox.cpp') diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index d04ed91d8..72f610364 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -5621,8 +5621,8 @@ void TestBlackbox::qbsSession() } else if (msgType == "task-progress") { receivedProgressData = true; } else if (msgType == "command-description") { - if (receivedMessage.value("message").toString().contains( - QDir::separator() + QString("main.cpp"))) { + if (QDir::fromNativeSeparators(receivedMessage.value("message").toString()) + .contains("/main.cpp")) { receivedCommandDescription = true; } } else if (msgType == "process-result") { -- cgit v1.2.1