diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2019-02-13 19:08:57 +0100 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2019-02-18 12:41:28 +0000 |
| commit | 3154002fb6b20981ad5de8b677199d30df565b47 (patch) | |
| tree | aa0b65f80f3b55108d8ef2777f12bc7ff8c09953 /tests/unit/unittest/pchtasksmerger-test.cpp | |
| parent | 716a96a55b1e4583d57d08cc9b511385139ac731 (diff) | |
| download | qt-creator-3154002fb6b20981ad5de8b677199d30df565b47.tar.gz | |
ClangPchManager: Fix PchTaskMerger
We forgot to remove the duplicates for used macros.
Task-number: QTCREATORBUG-21955
Change-Id: I051b8199ba5dd0a173d80c9e526bf745d3bcd777
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'tests/unit/unittest/pchtasksmerger-test.cpp')
| -rw-r--r-- | tests/unit/unittest/pchtasksmerger-test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/unittest/pchtasksmerger-test.cpp b/tests/unit/unittest/pchtasksmerger-test.cpp index e878438f33..c279da505e 100644 --- a/tests/unit/unittest/pchtasksmerger-test.cpp +++ b/tests/unit/unittest/pchtasksmerger-test.cpp @@ -173,7 +173,7 @@ TEST_F(PchTasksMerger, MacrosCanBeMerged) CompilerMacros compilerMacros1{{"ER", "2", 2}, {"QI"}, {"SE", "4", 1}, {"SAN", "3", 3}}; CompilerMacros compilerMacros2{{"BA"}, {"ER", "2", 2}, {"YI", "1", 1}, {"SAN", "3", 3}}; - auto canBeMerged = Merger::hasDuplicates(Merger::mergeMacros(compilerMacros1, compilerMacros2)); + auto canBeMerged = !Merger::hasDuplicates(Merger::mergeMacros(compilerMacros1, compilerMacros2)); ASSERT_TRUE(canBeMerged); } @@ -183,7 +183,7 @@ TEST_F(PchTasksMerger, MacrosCannotBeMergedBecauseDifferentValue) CompilerMacros compilerMacros1{{"ER", "2", 2}, {"SE", "4", 1}, {"SAN", "3", 3}}; CompilerMacros compilerMacros2{{"ER", "1", 2}, {"YI", "1", 1}, {"SAN", "3", 3}}; - auto canBeMerged = Merger::hasDuplicates(Merger::mergeMacros(compilerMacros1, compilerMacros2)); + auto canBeMerged = !Merger::hasDuplicates(Merger::mergeMacros(compilerMacros1, compilerMacros2)); ASSERT_FALSE(canBeMerged); } @@ -193,7 +193,7 @@ TEST_F(PchTasksMerger, MacrosCannotBeMergedBecauseUndefinedMacro) CompilerMacros compilerMacros1{{"ER", "2", 2}, {"SE", "4", 1}, {"YI"}, {"SAN", "3", 3}}; CompilerMacros compilerMacros2{{"ER", "2", 2}, {"YI", "1", 1}, {"SAN", "3", 3}}; - auto canBeMerged = Merger::hasDuplicates(Merger::mergeMacros(compilerMacros1, compilerMacros2)); + auto canBeMerged = !Merger::hasDuplicates(Merger::mergeMacros(compilerMacros1, compilerMacros2)); ASSERT_FALSE(canBeMerged); } |