feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Adapt unit tests to clang-5.0

Browse Source 
Disable the tests on clang-3.x.

Change-Id: I80a8840c25e55785034abf7b5964a14afb01d9e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Orgad Shaneh
2017-06-22 01:21:20 +03:00
committed by Orgad Shaneh
parent e133ee8928
commit 2c55c10cac
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/unittest/conditionally-disabled-tests.h
View File

@@ -24,9 +24,16 @@
****************************************************************************/
#include <QtGlobal>
#include <clang-c/Index.h>
#ifdef Q_OS_WIN
# define DISABLED_ON_WINDOWS(x) DISABLED_##x
#else
# define DISABLED_ON_WINDOWS(x) x
#endif
#if CINDEX_VERSION_MAJOR > 0 || CINDEX_VERSION_MINOR <= 35
# define DISABLED_ON_CLANG3(x) DISABLED_##x
#else
# define DISABLED_ON_CLANG3(x) x
#endif

12
tests/unit/unittest/highlightingmarks-test.cpp
View File

@@ -856,25 +856,25 @@ TEST_F(HighlightingMarks, FunctionAlias)
ASSERT_THAT(infos[0], HasOnlyType(HighlightingType::Type));
}
TEST_F(HighlightingMarks, FriendTypeDeclaration)
TEST_F(HighlightingMarks, DISABLED_ON_CLANG3(FriendTypeDeclaration))
{
const auto infos = translationUnit.highlightingMarksInRange(sourceRange(350, 28));
ASSERT_THAT(infos[2], HasOnlyType(HighlightingType::Invalid));
ASSERT_THAT(infos[2], HasOnlyType(HighlightingType::Type));
}
TEST_F(HighlightingMarks, FriendArgumentTypeDeclaration)
TEST_F(HighlightingMarks, DISABLED_ON_CLANG3(FriendArgumentTypeDeclaration))
{
const auto infos = translationUnit.highlightingMarksInRange(sourceRange(351, 65));
ASSERT_THAT(infos[6], HasOnlyType(HighlightingType::Invalid));
ASSERT_THAT(infos[6], HasOnlyType(HighlightingType::Type));
}
TEST_F(HighlightingMarks, FriendArgumentDeclaration)
TEST_F(HighlightingMarks, DISABLED_ON_CLANG3(FriendArgumentDeclaration))
{
const auto infos = translationUnit.highlightingMarksInRange(sourceRange(351, 65));
ASSERT_THAT(infos[8], HasOnlyType(HighlightingType::Invalid));
ASSERT_THAT(infos[8], HasOnlyType(HighlightingType::LocalVariable));
}
TEST_F(HighlightingMarks, FieldInitialization)