diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-11-30 12:15:07 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-12-04 14:57:20 +0000 |
| commit | c7c800a73e61c743da6e05bcdbc5c06169805726 (patch) | |
| tree | 578aace15e3c9a07bb4cd7eeb5a756ac218018cd /tests | |
| parent | e57c1268ee302bd78059a13a046eade9d896c61e (diff) | |
CppTools: Split CppTools::UseBuiltin in two options
...for clarity.
No behavior change.
Change-Id: Id0334bc79b97a8ff53b37089e337530c9a01b1d4
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/unittest/compileroptionsbuilder-test.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp index 042f783027..9b8311709c 100644 --- a/tests/unit/unittest/compileroptionsbuilder-test.cpp +++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp @@ -89,7 +89,8 @@ TEST_F(CompilerOptionsBuilder, AddToolchainAndProjectMacrosWithoutSkipingLanguag { CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart, CppTools::UseSystemHeader::No, - CppTools::UseBuiltin::Yes, + CppTools::UseToolchainMacros::Yes, + CppTools::UseTweakedHeaderPaths::Yes, CppTools::UseLanguageDefines::Yes}; compilerOptionsBuilder.addToolchainAndProjectMacros(); @@ -147,7 +148,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersPath) { CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::UseSystemHeader::No, - CppTools::UseBuiltin::Yes, + CppTools::UseToolchainMacros::Yes, + CppTools::UseTweakedHeaderPaths::Yes, CppTools::UseLanguageDefines::No, "7.0.0", ""); @@ -176,7 +178,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderMacOs) projectPart.headerPaths.append(defaultPaths); CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::UseSystemHeader::No, - CppTools::UseBuiltin::Yes, + CppTools::UseToolchainMacros::Yes, + CppTools::UseTweakedHeaderPaths::Yes, CppTools::UseLanguageDefines::No, "7.0.0", ""); @@ -210,7 +213,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderLinux) projectPart.toolChainTargetTriple = "x86_64-linux-gnu"; CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::UseSystemHeader::No, - CppTools::UseBuiltin::Yes, + CppTools::UseToolchainMacros::Yes, + CppTools::UseTweakedHeaderPaths::Yes, CppTools::UseLanguageDefines::No, "7.0.0", ""); @@ -240,7 +244,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderNoVersion) projectPart.toolChainTargetTriple = "x86_64-w64-windows-gnu"; CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::UseSystemHeader::No, - CppTools::UseBuiltin::Yes, + CppTools::UseToolchainMacros::Yes, + CppTools::UseTweakedHeaderPaths::Yes, CppTools::UseLanguageDefines::No, "7.0.0", ""); @@ -277,7 +282,8 @@ TEST_F(CompilerOptionsBuilder, ClangHeadersAndCppIncludesPathsOrderAndroidClang) projectPart.toolChainTargetTriple = "i686-linux-android"; CppTools::CompilerOptionsBuilder compilerOptionsBuilder(projectPart, CppTools::UseSystemHeader::No, - CppTools::UseBuiltin::Yes, + CppTools::UseToolchainMacros::Yes, + CppTools::UseTweakedHeaderPaths::Yes, CppTools::UseLanguageDefines::No, "7.0.0", ""); |