diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-03-19 22:24:33 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-04-10 07:27:02 +0000 |
| commit | 62e07306481373d9d9b6b656d855b204aa6964f3 (patch) | |
| tree | dac1f681be32eaba98b117a481a9011500af9b91 /tests/auto/blackbox/testdata | |
| parent | 14324ad4aa9582e07dc687dc63b1b886f2d272e5 (diff) | |
Add support for the clang-cl compiler
Task-number: QBS-1316
Change-Id: Ibf9da364610c260ead088a8990a70c7739d53c39
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata')
4 files changed, 13 insertions, 2 deletions
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") |