aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-08-30 11:01:36 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2016-08-30 13:57:52 +0000
commitdb8b882f7791abc14f9c83bfcb74b75b4e84c709 (patch)
treed7b66836cbda901a45969ab63c40494d077da7fb
parent3514050f38d90ccd698ba1555249f40bafdaa6e0 (diff)
Fix clangdb test on Windows
We cannot just run cl.exe on the command line, as it needs a special environment. Just skip this part (we don't want to duplicate the setup logic in the test). Change-Id: I3fbe875c82b9ae255c3da7f352923291ccbe7481 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-rw-r--r--tests/auto/blackbox/tst_clangdb.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp
index 0ea4f7b25..8746a7811 100644
--- a/tests/auto/blackbox/tst_clangdb.cpp
+++ b/tests/auto/blackbox/tst_clangdb.cpp
@@ -139,6 +139,11 @@ void TestClangDb::checkDbIsConsistentWithProject()
QVERIFY(entry.value("file").isString());
QVERIFY(entry.value("file").toString() == sourceFilePath);
+ qbs::Settings settings((QString()));
+ qbs::Profile profile(profileName(), &settings);
+ if (profile.value("qbs.toolchain").toStringList().contains("msvc"))
+ QSKIP("MSVC command line is not self-contained");
+
// Validate the compile command itself, this requires a previous build since the command
// line contains 'deep' path that are creating during Qbs build run
QByteArray stdErr;