diff options
author | Jonas Toth <jonas.toth@gmail.com> | 2018-10-04 15:55:37 +0000 |
---|---|---|
committer | Jonas Toth <jonas.toth@gmail.com> | 2018-10-04 15:55:37 +0000 |
commit | 9b8ad4f2f95056502e0f89370705e6c058349cd3 (patch) | |
tree | b99de75bfb3742073744ab1d12379b12d252a154 | |
parent | 5f02827306c32226caed42746f64219d1f122419 (diff) |
[clang-tidy] NFC use CHECK-NOTES in tests for performance-move-constructor-init
Reviewers: alexfh, aaron.ballman, hokein
Reviewed By: alexfh
Subscribers: lebedev.ri, xazax.hun, cfe-commits
Differential Revision: https://reviews.llvm.org/D52691
-rwxr-xr-x | clang-tools-extra/test/clang-tidy/check_clang_tidy.py | 4 | ||||
-rw-r--r-- | clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py index d8086b16eae..46fe0f6c8af 100755 --- a/clang-tools-extra/test/clang-tidy/check_clang_tidy.py +++ b/clang-tools-extra/test/clang-tidy/check_clang_tidy.py @@ -164,7 +164,9 @@ def main(): if has_check_notes: notes_file = temp_file_name + '.notes' - write_file(notes_file, clang_tidy_output) + filtered_output = [line for line in clang_tidy_output.splitlines() + if not "note: FIX-IT applied suggested changes" in line] + write_file(notes_file, '\n'.join(filtered_output)) try: subprocess.check_output( ['FileCheck', '-input-file=' + notes_file, input_file_name, diff --git a/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp b/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp index c9ed3469894..09108fcca35 100644 --- a/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp +++ b/clang-tools-extra/test/clang-tidy/performance-move-constructor-init.cpp @@ -30,9 +30,9 @@ struct B { struct D : B { D() : B() {} D(const D &RHS) : B(RHS) {} - // CHECK-MESSAGES: :[[@LINE+3]]:16: warning: move constructor initializes base class by calling a copy constructor [performance-move-constructor-init] - // CHECK-MESSAGES: 26:3: note: copy constructor being called - // CHECK-MESSAGES: 27:3: note: candidate move constructor here + // CHECK-NOTES: :[[@LINE+3]]:16: warning: move constructor initializes base class by calling a copy constructor [performance-move-constructor-init] + // CHECK-NOTES: 26:3: note: copy constructor being called + // CHECK-NOTES: 27:3: note: candidate move constructor here D(D &&RHS) : B(RHS) {} }; @@ -75,8 +75,10 @@ struct L : K { struct M { B Mem; - // CHECK-MESSAGES: :[[@LINE+1]]:16: warning: move constructor initializes class member by calling a copy constructor [performance-move-constructor-init] + // CHECK-NOTES: :[[@LINE+1]]:16: warning: move constructor initializes class member by calling a copy constructor [performance-move-constructor-init] M(M &&RHS) : Mem(RHS.Mem) {} + // CHECK-NOTES: 26:3: note: copy constructor being called + // CHECK-NOTES: 27:3: note: candidate move constructor here }; struct N { @@ -109,7 +111,7 @@ struct TriviallyCopyable { struct Positive { Positive(Movable M) : M_(M) {} - // CHECK-MESSAGES: [[@LINE-1]]:12: warning: pass by value and use std::move [modernize-pass-by-value] + // CHECK-NOTES: [[@LINE-1]]:12: warning: pass by value and use std::move [modernize-pass-by-value] // CHECK-FIXES: Positive(Movable M) : M_(std::move(M)) {} Movable M_; }; |