Add support for the clang-cl compiler

Task-number: QBS-1316
Change-Id: Ibf9da364610c260ead088a8990a70c7739d53c39
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

7 files changed, 21 insertions, 2 deletions

diff --git a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
index a366e0ce0..4cc25ad66 100644
--- a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
+++ b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs
@@ -28,6 +28,7 @@ Project {
         Properties {
             condition: qbs.toolchain.contains("msvc")
             cpp.entryPoint: "main"
+            cpp.dynamicLibraries: ["ucrt", "kernel32"]
         }
         cpp.entryPoint: undefined
 
diff --git a/tests/auto/api/testdata/precompiled-header-dynamic/autogen.h.in b/tests/auto/api/testdata/precompiled-header-dynamic/autogen.h.in
index c5c182c8f..becfbba89 100644
--- a/tests/auto/api/testdata/precompiled-header-dynamic/autogen.h.in
+++ b/tests/auto/api/testdata/precompiled-header-dynamic/autogen.h.in
@@ -1 +1,6 @@
+#ifndef AUTOGEN_IN_H
+#define AUTOGEN_IN_H
+
 inline void f() { }
+
+#endif // AUTOGEN_IN_H
diff --git a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
index 6beaabfa3..322ded85c 100644
--- a/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
+++ b/tests/auto/blackbox/testdata/cxx-language-version/cxx-language-version.qbs
@@ -13,7 +13,10 @@ CppApplication {
             var isEvenNewerMsvc;
             var isOlderMsvc;
             var isGcc;
-            if (toolchain.contains("msvc")) {
+            if (toolchain.contains("clang-cl")) {
+                isEvenNewerMsvc = true;
+                isNewerMsvc = true;
+            } else if (toolchain.contains("msvc")) {
                 if (compilerVersion >= "19.12.25831")
                     isEvenNewerMsvc = true;
                 if (compilerVersion >= "18.00.30723")
diff --git a/tests/auto/blackbox/testdata/enableRtti/main.cpp b/tests/auto/blackbox/testdata/enableRtti/main.cpp
index 4dcd5d2e8..4011cf823 100644
--- a/tests/auto/blackbox/testdata/enableRtti/main.cpp
+++ b/tests/auto/blackbox/testdata/enableRtti/main.cpp
@@ -32,6 +32,10 @@
 #error RTTI is disabled!
 #endif
 
+#if defined(_MSC_VER) && !defined (_CPPRTTI)
+#error RTTI is disabled!
+#endif
+
 class I {
 public:
     virtual ~I() { }
diff --git a/tests/auto/blackbox/testdata/minimumSystemVersion/main.cpp b/tests/auto/blackbox/testdata/minimumSystemVersion/main.cpp
index 4cc99756b..47c9ed007 100644
--- a/tests/auto/blackbox/testdata/minimumSystemVersion/main.cpp
+++ b/tests/auto/blackbox/testdata/minimumSystemVersion/main.cpp
@@ -42,6 +42,10 @@ int main(int argc, char *argv[])
         return 1;
 
 #ifdef _WIN32
+#if defined(__clang__)
+    std::cout << "Unsupported compiler" << std::endl;
+    return 0;
+#endif
 #if defined(WINVER) && defined(QBS_WINVER)
     std::cout << "WINVER=" << WINVER << std::endl;
     std::string command = TOOLCHAIN_INSTALL_PATH;
diff --git a/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs b/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs
index 4bda00caf..346a94e21 100644
--- a/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs
+++ b/tests/auto/blackbox/testdata/no-exported-symbols/no-exported-symbols.qbs
@@ -12,7 +12,7 @@ Project {
             id: toolchainProbe
             property stringList toolchain: qbs.toolchain
             configure: {
-                if (toolchain.contains("msvc"))
+                if (toolchain.contains("msvc") && !toolchain.contains("clang-cl"))
                     console.info("compiler is MSVC")
                 else
                     console.info("compiler is not MSVC")
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index ca11e4e3e..219a473e0 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -6414,6 +6414,8 @@ void TestBlackbox::minimumSystemVersion()
     QbsRunParameters params({ "-f", file + ".qbs" });
     params.command = "run";
     QCOMPARE(runQbs(params), 0);
+    if (m_qbsStdout.contains("Unsupported compiler"))
+        QSKIP("Unsupported compiler");
     if (!m_qbsStdout.contains(output.toUtf8())) {
         qDebug() << "expected output:" << qPrintable(output);
         qDebug() << "actual output:" << m_qbsStdout.constData();