diff options
| author | Manuel Klimek <klimek@google.com> | 2012-07-10 14:21:30 +0000 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2012-07-10 14:21:30 +0000 |
| commit | e265c877934dd24d11d85e991ede7d0742178495 (patch) | |
| tree | 16577181a3abb58b89f5b22cc8b75b42cfada779 | |
| parent | 8fa2fb859a4cb8e67d9763225281d9b0aa9cb59f (diff) | |
Fixes the MSVC build.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159992 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Tooling/auto-detect-from-source-parent-of-cwd.cpp | 2 | ||||
| -rw-r--r-- | test/Tooling/auto-detect-from-source-parent.cpp | 2 | ||||
| -rw-r--r-- | test/Tooling/auto-detect-from-source.cpp | 2 | ||||
| -rw-r--r-- | unittests/ASTMatchers/ASTMatchersTest.cpp | 8 |
4 files changed, 14 insertions, 0 deletions
diff --git a/test/Tooling/auto-detect-from-source-parent-of-cwd.cpp b/test/Tooling/auto-detect-from-source-parent-of-cwd.cpp index 7a4f9af6c4..9692edcd4f 100644 --- a/test/Tooling/auto-detect-from-source-parent-of-cwd.cpp +++ b/test/Tooling/auto-detect-from-source-parent-of-cwd.cpp @@ -6,3 +6,5 @@ // CHECK: C++ requires invalid; + +// REQUIRES: shell diff --git a/test/Tooling/auto-detect-from-source-parent.cpp b/test/Tooling/auto-detect-from-source-parent.cpp index cb5fd56328..ea7eb158be 100644 --- a/test/Tooling/auto-detect-from-source-parent.cpp +++ b/test/Tooling/auto-detect-from-source-parent.cpp @@ -6,3 +6,5 @@ // CHECK: C++ requires invalid; + +// REQUIRES: shell diff --git a/test/Tooling/auto-detect-from-source.cpp b/test/Tooling/auto-detect-from-source.cpp index 40a2a1c9fe..d8e82e7754 100644 --- a/test/Tooling/auto-detect-from-source.cpp +++ b/test/Tooling/auto-detect-from-source.cpp @@ -6,3 +6,5 @@ // CHECK: C++ requires invalid; + +// REQUIRES: shell diff --git a/unittests/ASTMatchers/ASTMatchersTest.cpp b/unittests/ASTMatchers/ASTMatchersTest.cpp index 290da9005d..3f7b5ed39d 100644 --- a/unittests/ASTMatchers/ASTMatchersTest.cpp +++ b/unittests/ASTMatchers/ASTMatchersTest.cpp @@ -44,7 +44,12 @@ TEST(NameableDeclaration, MatchesVariousDecls) { TEST(DeclarationMatcher, MatchClass) { DeclarationMatcher ClassMatcher(record()); +#if !defined(_MSC_VER) EXPECT_FALSE(matches("", ClassMatcher)); +#else + // Matches class type_info. + EXPECT_TRUE(matches("", ClassMatcher)); +#endif DeclarationMatcher ClassX = record(record(hasName("X"))); EXPECT_TRUE(matches("class X;", ClassX)); @@ -839,12 +844,15 @@ TEST(Function, MatchesFunctionDeclarations) { EXPECT_TRUE(matches("void f() { f(); }", CallFunctionF)); EXPECT_TRUE(notMatches("void f() { }", CallFunctionF)); +#if !defined(_MSC_VER) + // FIXME: Make this work for MSVC. // Dependent contexts, but a non-dependent call. EXPECT_TRUE(matches("void f(); template <int N> void g() { f(); }", CallFunctionF)); EXPECT_TRUE( matches("void f(); template <int N> struct S { void g() { f(); } };", CallFunctionF)); +#endif // Depedent calls don't match. EXPECT_TRUE( |