aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-07-09 09:44:39 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-07-09 17:24:16 +0000
commit782ca5d8d8e88b25b3424848c1297caf94a66585 (patch)
tree7009c9e973e870f6d1c362c65c19f4e05a332829 /tests
parentd964e91432b543c66790172757a1616214b3f0fd (diff)
Clang: Fix error when including float.h with mingw
Prevent mingw from trying to #include_next a private header from a path we cannot add to our list of includes. Fixes: QTCREATORBUG-24251 Task-number: QTCREATORBUG-24027 Change-Id: I18a9db130b9c2265cd208c3506d08d2e1c4cee45 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/unittest/compileroptionsbuilder-test.cpp33
1 files changed, 33 insertions, 0 deletions
diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp
index 2a6bfd8462..76fe2be066 100644
--- a/tests/unit/unittest/compileroptionsbuilder-test.cpp
+++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp
@@ -475,6 +475,39 @@ TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders)
ASSERT_THAT(compilerOptionsBuilder.options(), Contains(IsPartOfHeader("wrappedQtHeaders")));
}
+TEST_F(CompilerOptionsBuilder, InsertWrappedMingwHeadersWithNonMingwToolchain)
+{
+ CppTools::CompilerOptionsBuilder builder{
+ projectPart,
+ CppTools::UseSystemHeader::Yes,
+ CppTools::UseTweakedHeaderPaths::Yes,
+ CppTools::UseLanguageDefines::No,
+ CppTools::UseBuildSystemWarnings::No,
+ "dummy_version",
+ ""};
+
+ builder.insertWrappedMingwHeaders();
+
+ ASSERT_THAT(builder.options(), Not(Contains(IsPartOfHeader("wrappedMingwHeaders"))));
+}
+
+TEST_F(CompilerOptionsBuilder, InsertWrappedMingwHeadersWithMingwToolchain)
+{
+ CppTools::CompilerOptionsBuilder builder{
+ projectPart,
+ CppTools::UseSystemHeader::Yes,
+ CppTools::UseTweakedHeaderPaths::Yes,
+ CppTools::UseLanguageDefines::No,
+ CppTools::UseBuildSystemWarnings::No,
+ "dummy_version",
+ ""};
+ projectPart.toolchainType = ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID;
+
+ builder.insertWrappedMingwHeaders();
+
+ ASSERT_THAT(builder.options(), Contains(IsPartOfHeader("wrappedMingwHeaders")));
+}
+
TEST_F(CompilerOptionsBuilder, SetLanguageVersion)
{
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);