From 9e4a4586f95e05d4ab6f8f5cc9121dbdc0fd82c0 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 1 Jul 2015 14:50:35 +0200 Subject: [PATCH] Clang: Tests: Fix unit tests compilation on Windows Change-Id: Id9e51de3b2bcb273fd2268ba7f7192f80dee1f53 Reviewed-by: Christian Stenger Reviewed-by: Marco Bubke --- tests/unit/echoserver/echoserverprocessmain.cpp | 3 ++- tests/unit/unittest/clangcodecompleteresultstest.cpp | 2 +- tests/unit/unittest/clangipcservertest.cpp | 2 +- tests/unit/unittest/clangstringtest.cpp | 2 +- tests/unit/unittest/clientserverinprocesstest.cpp | 2 +- tests/unit/unittest/clientserveroutsideprocess.cpp | 2 +- tests/unit/unittest/codecompletionsextractortest.cpp | 2 +- tests/unit/unittest/completionchunkstotextconvertertest.cpp | 2 +- tests/unit/unittest/lineprefixertest.cpp | 2 +- tests/unit/unittest/main.cpp | 2 +- tests/unit/unittest/mockipclient.h | 2 +- tests/unit/unittest/mockipcserver.h | 2 +- tests/unit/unittest/projecttest.cpp | 2 +- tests/unit/unittest/readandwritecommandblocktest.cpp | 2 +- tests/unit/unittest/sqlitecolumntest.cpp | 2 +- tests/unit/unittest/sqlitedatabasebackendtest.cpp | 2 +- tests/unit/unittest/sqlitedatabasetest.cpp | 2 +- tests/unit/unittest/sqlitestatementtest.cpp | 2 +- tests/unit/unittest/sqlitetabletest.cpp | 2 +- tests/unit/unittest/sqlstatementbuildertest.cpp | 2 +- tests/unit/unittest/translationunitstest.cpp | 2 +- tests/unit/unittest/translationunittest.cpp | 2 +- 22 files changed, 23 insertions(+), 22 deletions(-) diff --git a/tests/unit/echoserver/echoserverprocessmain.cpp b/tests/unit/echoserver/echoserverprocessmain.cpp index 829efffa9ab..59bac139994 100644 --- a/tests/unit/echoserver/echoserverprocessmain.cpp +++ b/tests/unit/echoserver/echoserverprocessmain.cpp @@ -28,9 +28,10 @@ ** ****************************************************************************/ +#include "echoipcserver.h" + #include #include -#include #include diff --git a/tests/unit/unittest/clangcodecompleteresultstest.cpp b/tests/unit/unittest/clangcodecompleteresultstest.cpp index a56fc5ed7f3..95dd3b3a951 100644 --- a/tests/unit/unittest/clangcodecompleteresultstest.cpp +++ b/tests/unit/unittest/clangcodecompleteresultstest.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/clangipcservertest.cpp b/tests/unit/unittest/clangipcservertest.cpp index 3f52dbd7bf2..1c7c74da79d 100644 --- a/tests/unit/unittest/clangipcservertest.cpp +++ b/tests/unit/unittest/clangipcservertest.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" using testing::Property; using testing::Contains; diff --git a/tests/unit/unittest/clangstringtest.cpp b/tests/unit/unittest/clangstringtest.cpp index 459dea1f572..33d4a785ad3 100644 --- a/tests/unit/unittest/clangstringtest.cpp +++ b/tests/unit/unittest/clangstringtest.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/clientserverinprocesstest.cpp b/tests/unit/unittest/clientserverinprocesstest.cpp index 500fd225828..9010b4130f0 100644 --- a/tests/unit/unittest/clientserverinprocesstest.cpp +++ b/tests/unit/unittest/clientserverinprocesstest.cpp @@ -59,7 +59,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" using namespace ClangBackEnd; diff --git a/tests/unit/unittest/clientserveroutsideprocess.cpp b/tests/unit/unittest/clientserveroutsideprocess.cpp index bd2571afb00..82ecbde5672 100644 --- a/tests/unit/unittest/clientserveroutsideprocess.cpp +++ b/tests/unit/unittest/clientserveroutsideprocess.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" #include #include diff --git a/tests/unit/unittest/codecompletionsextractortest.cpp b/tests/unit/unittest/codecompletionsextractortest.cpp index 91a5adcec6e..29b62811bc9 100644 --- a/tests/unit/unittest/codecompletionsextractortest.cpp +++ b/tests/unit/unittest/codecompletionsextractortest.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" using ClangBackEnd::CodeCompletionsExtractor; using ClangBackEnd::ClangCodeCompleteResults; diff --git a/tests/unit/unittest/completionchunkstotextconvertertest.cpp b/tests/unit/unittest/completionchunkstotextconvertertest.cpp index 06ce46df7c9..97f017c0695 100644 --- a/tests/unit/unittest/completionchunkstotextconvertertest.cpp +++ b/tests/unit/unittest/completionchunkstotextconvertertest.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/lineprefixertest.cpp b/tests/unit/unittest/lineprefixertest.cpp index 6f205e924de..7f594c48879 100644 --- a/tests/unit/unittest/lineprefixertest.cpp +++ b/tests/unit/unittest/lineprefixertest.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/main.cpp b/tests/unit/unittest/main.cpp index be9922797a0..f8135d03c12 100644 --- a/tests/unit/unittest/main.cpp +++ b/tests/unit/unittest/main.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include "gtest-qt-printing.h" int main(int argc, char *argv[]) { diff --git a/tests/unit/unittest/mockipclient.h b/tests/unit/unittest/mockipclient.h index 97dc2825b64..b0d059b7de3 100644 --- a/tests/unit/unittest/mockipclient.h +++ b/tests/unit/unittest/mockipclient.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" class MockIpcClient : public ClangBackEnd::IpcClientInterface { public: diff --git a/tests/unit/unittest/mockipcserver.h b/tests/unit/unittest/mockipcserver.h index cc7e54c5792..63d3e3e72ce 100644 --- a/tests/unit/unittest/mockipcserver.h +++ b/tests/unit/unittest/mockipcserver.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" class MockIpcServer : public ClangBackEnd::IpcServerInterface { public: diff --git a/tests/unit/unittest/projecttest.cpp b/tests/unit/unittest/projecttest.cpp index ddc2cb0dd65..facf06dc376 100644 --- a/tests/unit/unittest/projecttest.cpp +++ b/tests/unit/unittest/projecttest.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" #include #include diff --git a/tests/unit/unittest/readandwritecommandblocktest.cpp b/tests/unit/unittest/readandwritecommandblocktest.cpp index 9e07b6d397f..aab8672b433 100644 --- a/tests/unit/unittest/readandwritecommandblocktest.cpp +++ b/tests/unit/unittest/readandwritecommandblocktest.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" using namespace testing; namespace CodeModelBackeEndTest { diff --git a/tests/unit/unittest/sqlitecolumntest.cpp b/tests/unit/unittest/sqlitecolumntest.cpp index f3cbe752269..6be3e799d35 100644 --- a/tests/unit/unittest/sqlitecolumntest.cpp +++ b/tests/unit/unittest/sqlitecolumntest.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/sqlitedatabasebackendtest.cpp b/tests/unit/unittest/sqlitedatabasebackendtest.cpp index 5b46ec7dd40..786a0d4ae1b 100644 --- a/tests/unit/unittest/sqlitedatabasebackendtest.cpp +++ b/tests/unit/unittest/sqlitedatabasebackendtest.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/sqlitedatabasetest.cpp b/tests/unit/unittest/sqlitedatabasetest.cpp index a55a2d01a4c..99727dc53f8 100644 --- a/tests/unit/unittest/sqlitedatabasetest.cpp +++ b/tests/unit/unittest/sqlitedatabasetest.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/sqlitestatementtest.cpp b/tests/unit/unittest/sqlitestatementtest.cpp index ddecb5d9b1f..0aff1c76250 100644 --- a/tests/unit/unittest/sqlitestatementtest.cpp +++ b/tests/unit/unittest/sqlitestatementtest.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { class SqliteStatement : public ::testing::Test diff --git a/tests/unit/unittest/sqlitetabletest.cpp b/tests/unit/unittest/sqlitetabletest.cpp index 4d0b9e2780d..93800c70fee 100644 --- a/tests/unit/unittest/sqlitetabletest.cpp +++ b/tests/unit/unittest/sqlitetabletest.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" namespace { diff --git a/tests/unit/unittest/sqlstatementbuildertest.cpp b/tests/unit/unittest/sqlstatementbuildertest.cpp index 7babc6b9a54..4e8e46424e2 100644 --- a/tests/unit/unittest/sqlstatementbuildertest.cpp +++ b/tests/unit/unittest/sqlstatementbuildertest.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" using namespace ::testing; diff --git a/tests/unit/unittest/translationunitstest.cpp b/tests/unit/unittest/translationunitstest.cpp index 105129fce6a..43d5d4e4590 100644 --- a/tests/unit/unittest/translationunitstest.cpp +++ b/tests/unit/unittest/translationunitstest.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" using ClangBackEnd::TranslationUnit; using ClangBackEnd::UnsavedFiles; diff --git a/tests/unit/unittest/translationunittest.cpp b/tests/unit/unittest/translationunittest.cpp index aba1a15876a..25235940bf0 100644 --- a/tests/unit/unittest/translationunittest.cpp +++ b/tests/unit/unittest/translationunittest.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include "gtest-qt-printing.h" #include #include