From fc1dafba60411afc6587d0d636898870766807c5 Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Thu, 20 Nov 2014 12:05:51 +0000 Subject: [PATCH] [clang-tidy] Count errors in ClangTidyDiagnosticConsumer This re-applies r222363 reverted in r222390 after compilation errors in our out-of-tree clang-tidy tests were fixed. llvm-svn: 222427 --- clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp | 3 +++ clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp index 06e0e3f..ad341ce 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp @@ -277,6 +277,9 @@ void ClangTidyDiagnosticConsumer::finalizeLastError() { void ClangTidyDiagnosticConsumer::HandleDiagnostic( DiagnosticsEngine::Level DiagLevel, const Diagnostic &Info) { + // Count warnings/errors. + DiagnosticConsumer::HandleDiagnostic(DiagLevel, Info); + if (DiagLevel == DiagnosticsEngine::Note) { assert(!Errors.empty() && "A diagnostic note can only be appended to a message."); diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp index 205c002..4b32852 100644 --- a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp +++ b/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp @@ -6,7 +6,7 @@ struct A { virtual void f() {} virtual void g() {} }; -// CHECK-NOT: warning +// CHECK-NOT: warning: struct B : public A { void placeholder_for_f() {} // CHECK-SANITY: [[@LINE-1]]:8: warning: Annotate this -- 2.7.4