diff options
| author | Alexander Kornienko <alexfh@google.com> | 2015-02-05 14:50:17 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2015-02-05 14:50:17 +0000 |
| commit | b6e1fde719b3c95bb1566d390f762ec96a4a2718 (patch) | |
| tree | 801405a6afdc6905ffa61ef0afc2bb9a5f659c14 /clang-tools-extra/test/clang-tidy/config-files.cpp | |
| parent | 15774dfc21ffbc14b2e67d6ad3a1f2b1a22983e9 (diff) | |
| download | bcm5719-llvm-b6e1fde719b3c95bb1566d390f762ec96a4a2718.tar.gz bcm5719-llvm-b6e1fde719b3c95bb1566d390f762ec96a4a2718.zip | |
[clang-tidy] Don't ignore default set of checks when a config file is found.
Summary:
This makes clang-tidy merge the default set of checks with the one
provided in the configuration file instead of just using the checks from the
config file. This adds a way to modify the default set of checks while the
previous behavior required to always define the set of checks completely.
Reviewers: djasper
Reviewed By: djasper
Subscribers: curdeius, cfe-commits
Differential Revision: http://reviews.llvm.org/D7434
llvm-svn: 228298
Diffstat (limited to 'clang-tools-extra/test/clang-tidy/config-files.cpp')
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/config-files.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang-tools-extra/test/clang-tidy/config-files.cpp b/clang-tools-extra/test/clang-tidy/config-files.cpp index ec3904d6f9e..65ac54a85d6 100644 --- a/clang-tools-extra/test/clang-tidy/config-files.cpp +++ b/clang-tools-extra/test/clang-tidy/config-files.cpp @@ -1,12 +1,12 @@ // RUN: clang-tidy -dump-config %S/Inputs/config-files/- -- | FileCheck %s -check-prefix=CHECK-BASE -// CHECK-BASE: Checks: from-parent +// CHECK-BASE: Checks: {{.*}}from-parent // CHECK-BASE: HeaderFilterRegex: parent // RUN: clang-tidy -dump-config %S/Inputs/config-files/1/- -- | FileCheck %s -check-prefix=CHECK-CHILD1 -// CHECK-CHILD1: Checks: from-child1 +// CHECK-CHILD1: Checks: {{.*}}from-child1 // CHECK-CHILD1: HeaderFilterRegex: child1 // RUN: clang-tidy -dump-config %S/Inputs/config-files/2/- -- | FileCheck %s -check-prefix=CHECK-CHILD2 -// CHECK-CHILD2: Checks: from-parent +// CHECK-CHILD2: Checks: {{.*}}from-parent // CHECK-CHILD2: HeaderFilterRegex: parent // RUN: clang-tidy -dump-config -checks='from-command-line' -header-filter='from command line' %S/Inputs/config-files/- -- | FileCheck %s -check-prefix=CHECK-COMMAND-LINE -// CHECK-COMMAND-LINE: Checks: from-parent,from-command-line +// CHECK-COMMAND-LINE: Checks: {{.*}}from-parent,from-command-line // CHECK-COMMAND-LINE: HeaderFilterRegex: from command line |
