[clang-tools-extra] 1af159e - [clang-tidy][NFC] Update tests to CheckOptions using new syntax
Piotr Zegar via cfe-commits
cfe-commits at lists.llvm.org
Mon Aug 7 12:33:00 PDT 2023
Author: Piotr Zegar
Date: 2023-08-07T19:32:27Z
New Revision: 1af159e98c23a293c103e1f548866488126ed6f6
URL: https://github.com/llvm/llvm-project/commit/1af159e98c23a293c103e1f548866488126ed6f6
DIFF: https://github.com/llvm/llvm-project/commit/1af159e98c23a293c103e1f548866488126ed6f6.diff
LOG: [clang-tidy][NFC] Update tests to CheckOptions using new syntax
This patch is just updating all test files to use the new syntax.
Fix for changes introduced after D130209 were created.
Added:
Modified:
clang-tools-extra/test/clang-tidy/checkers/bugprone/empty-catch.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone/non-zero-enum-to-bool-conversion.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone/optional-value-conversion.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression-warn-on-sizeof-pointer-to-aggregate.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access-ignore-smart.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone/unsafe-functions.c
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-do-while.cpp
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp
clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/rvalue-reference-param-not-moved.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-templates.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-pointer-as-values.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-values.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-unaligned.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-wrong-config.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/header-include-cycle.cpp
clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-virtual.cpp
clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-templates.cpp
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-custom.cpp
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-fmt.cpp
clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
clang-tools-extra/test/clang-tidy/checkers/performance/enum-size.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls-macros.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type-macros.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-alternative.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-traditional.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-function.cpp
clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/.clang-tidy
clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/44/.clang-tidy
clang-tools-extra/test/clang-tidy/infrastructure/dump-config-invalid.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/empty-catch.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/empty-catch.cpp
index 687f9c920fb39e..8ab38229b6dbf8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/empty-catch.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/empty-catch.cpp
@@ -1,6 +1,6 @@
// RUN: %check_clang_tidy -std=c++98-or-later %s bugprone-empty-catch %t -- \
-// RUN: -config="{CheckOptions: [{key: bugprone-empty-catch.AllowEmptyCatchForExceptions, value: '::SafeException;WarnException'}, \
-// RUN: {key: bugprone-empty-catch.IgnoreCatchWithKeywords, value: '@IGNORE;@TODO'}]}" -- -fexceptions
+// RUN: -config="{CheckOptions: {bugprone-empty-catch.AllowEmptyCatchForExceptions: '::SafeException;WarnException', \
+// RUN: bugprone-empty-catch.IgnoreCatchWithKeywords: '@IGNORE;@TODO'}}" -- -fexceptions
struct Exception {};
struct SafeException {};
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/non-zero-enum-to-bool-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/non-zero-enum-to-bool-conversion.cpp
index 00f2e71229895e..e0728680d4c6ad 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/non-zero-enum-to-bool-conversion.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/non-zero-enum-to-bool-conversion.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy -std=c++98-or-later %s bugprone-non-zero-enum-to-bool-conversion %t -- \
-// RUN: -config="{CheckOptions: [{key: bugprone-non-zero-enum-to-bool-conversion.EnumIgnoreList, value: '::without::issue::IgnoredEnum;IgnoredSecondEnum'}]}"
+// RUN: -config="{CheckOptions: {bugprone-non-zero-enum-to-bool-conversion.EnumIgnoreList: '::without::issue::IgnoredEnum;IgnoredSecondEnum'}}"
namespace with::issue {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/optional-value-conversion.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/optional-value-conversion.cpp
index bc11420182d01e..72ef35c956d2e8 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/optional-value-conversion.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/optional-value-conversion.cpp
@@ -1,7 +1,7 @@
// RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-optional-value-conversion %t -- --fix-notes
// RUN: %check_clang_tidy -check-suffix=CUSTOM -std=c++17-or-later %s bugprone-optional-value-conversion %t -- \
-// RUN: -config="{CheckOptions: [{key: 'bugprone-optional-value-conversion.OptionalTypes', value: 'CustomOptional'}, \
-// RUN: {key: 'bugprone-optional-value-conversion.ValueMethods', value: '::Read$;::Ooo$'}]}" --fix-notes
+// RUN: -config="{CheckOptions: {bugprone-optional-value-conversion.OptionalTypes: 'CustomOptional', \
+// RUN: bugprone-optional-value-conversion.ValueMethods: '::Read$;::Ooo$'}}" --fix-notes
namespace std {
template<typename T>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression-warn-on-sizeof-pointer-to-aggregate.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression-warn-on-sizeof-pointer-to-aggregate.cpp
index 095a3cc16b16d3..a49cd99eeb7dc3 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression-warn-on-sizeof-pointer-to-aggregate.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression-warn-on-sizeof-pointer-to-aggregate.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-sizeof-expression %t -- -config="{CheckOptions: [{key: bugprone-sizeof-expression.WarnOnSizeOfPointerToAggregate, value: false}]}" --
+// RUN: %check_clang_tidy %s bugprone-sizeof-expression %t -- -config="{CheckOptions: {bugprone-sizeof-expression.WarnOnSizeOfPointerToAggregate: false}}" --
class C {
int size() { return sizeof(this); }
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access-ignore-smart.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access-ignore-smart.cpp
index d29153b3b7bbee..47bcf84484979a 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access-ignore-smart.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unchecked-optional-access-ignore-smart.cpp
@@ -1,6 +1,6 @@
// RUN: %check_clang_tidy %s bugprone-unchecked-optional-access %t -- \
-// RUN: -config="{CheckOptions: [ \
-// RUN: {key: bugprone-unchecked-optional-access.IgnoreSmartPointerDereference, value: true}]}" -- \
+// RUN: -config="{CheckOptions: \
+// RUN: {bugprone-unchecked-optional-access.IgnoreSmartPointerDereference: true}}" -- \
// RUN: -I %S/Inputs/unchecked-optional-access
#include "absl/types/optional.h"
diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unsafe-functions.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unsafe-functions.c
index 9c8eb7d5cbf11f..4bc2bad996d706 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/unsafe-functions.c
+++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/unsafe-functions.c
@@ -10,7 +10,7 @@
// RUN: %check_clang_tidy -check-suffix=WITHOUT-ANNEX-K %s bugprone-unsafe-functions %t -- -- -D__STDC_LIB_EXT1__=1 -U__STDC_WANT_LIB_EXT1__
// RUN: %check_clang_tidy -check-suffix=WITHOUT-ANNEX-K %s bugprone-unsafe-functions %t -- -- -U__STDC_LIB_EXT1__ -D__STDC_WANT_LIB_EXT1__=1
// RUN: %check_clang_tidy -check-suffix=WITH-ANNEX-K-CERT-ONLY %s bugprone-unsafe-functions %t -- \
-// RUN: -config="{CheckOptions: [{key: bugprone-unsafe-functions.ReportMoreUnsafeFunctions, value: false}]}" \
+// RUN: -config="{CheckOptions: {bugprone-unsafe-functions.ReportMoreUnsafeFunctions: false}}" \
// RUN: -- -D__STDC_LIB_EXT1__=1 -D__STDC_WANT_LIB_EXT1__=1
typedef __SIZE_TYPE__ size_t;
diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-do-while.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-do-while.cpp
index c37ebbf4cec260..d5a48ed2eaf70e 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-do-while.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/avoid-do-while.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy -check-suffixes=DEFAULT %s cppcoreguidelines-avoid-do-while %t
-// RUN: %check_clang_tidy -check-suffixes=IGNORE-MACROS %s cppcoreguidelines-avoid-do-while %t -- -config='{CheckOptions: [{key: cppcoreguidelines-avoid-do-while.IgnoreMacros, value: true}]}'
+// RUN: %check_clang_tidy -check-suffixes=IGNORE-MACROS %s cppcoreguidelines-avoid-do-while %t -- -config='{CheckOptions: {cppcoreguidelines-avoid-do-while.IgnoreMacros: true}}'
#define FOO(x) \
do { \
diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp
index 2353f58b6bfa54..281a817a42b30d 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init.cpp
@@ -1,7 +1,7 @@
// RUN: %check_clang_tidy %s cppcoreguidelines-prefer-member-initializer,modernize-use-default-member-init %t
// RUN: %check_clang_tidy %s cppcoreguidelines-prefer-member-initializer,modernize-use-default-member-init %t -- \
-// RUN: -config="{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: true}, \
-// RUN: {key: cppcoreguidelines-prefer-member-initializer.UseAssignment, value: false}]}"
+// RUN: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: true, \
+// RUN: cppcoreguidelines-prefer-member-initializer.UseAssignment: false}}"
class Simple1 {
int n;
diff --git a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/rvalue-reference-param-not-moved.cpp b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/rvalue-reference-param-not-moved.cpp
index 2ac2d17e0097d1..8f8e272e1e8a90 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/rvalue-reference-param-not-moved.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/rvalue-reference-param-not-moved.cpp
@@ -1,13 +1,13 @@
// RUN: %check_clang_tidy -std=c++11 %s cppcoreguidelines-rvalue-reference-param-not-moved %t -- \
-// RUN: -config="{CheckOptions: [{key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes, value: true}]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true}}" -- -fno-delayed-template-parsing
// RUN: %check_clang_tidy -check-suffix=,CXX14 -std=c++14 %s cppcoreguidelines-rvalue-reference-param-not-moved %t -- \
-// RUN: -config="{CheckOptions: [{key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes, value: true}]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true}}" -- -fno-delayed-template-parsing
// RUN: %check_clang_tidy -check-suffix=,NOSUBEXPR -std=c++11 %s cppcoreguidelines-rvalue-reference-param-not-moved %t -- \
-// RUN: -config="{CheckOptions: [{key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove, value: false},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes, value: true}]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: false, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true}}" -- -fno-delayed-template-parsing
// RUN: %check_clang_tidy -check-suffix=,UNNAMED -std=c++11 %s cppcoreguidelines-rvalue-reference-param-not-moved %t -- \
-// RUN: -config="{CheckOptions: [{key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams, value: false},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes, value: true}]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams: false, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true}}" -- -fno-delayed-template-parsing
// RUN: %check_clang_tidy -check-suffix=,NONDEDUCED -std=c++11 %s cppcoreguidelines-rvalue-reference-param-not-moved %t -- \
-// RUN: -config="{CheckOptions: [{key: cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams, value: true},{key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes, value: false}]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {cppcoreguidelines-rvalue-reference-param-not-moved.AllowPartialMove: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams: true, cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: false}}" -- -fno-delayed-template-parsing
// NOLINTBEGIN
namespace std {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp
index 9a150e887234d9..8d12a76950fefb 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp
@@ -1,8 +1,8 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t \
// RUN: -config='{CheckOptions: \
-// RUN: [{key: "misc-const-correctness.AnalyzeValues", value: true},\
-// RUN: {key: "misc-const-correctness.WarnPointersAsValues", value: true},\
-// RUN: {key: "misc-const-correctness.TransformPointersAsValues", value: true}]}' \
+// RUN: {misc-const-correctness.AnalyzeValues: true,\
+// RUN: misc-const-correctness.WarnPointersAsValues: true,\
+// RUN: misc-const-correctness.TransformPointersAsValues: true}}' \
// RUN: -- -fno-delayed-template-parsing
void potential_const_pointer() {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-templates.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-templates.cpp
index 149dd4ea4e2367..7b5ccabdd6ef61 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-templates.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-templates.cpp
@@ -1,10 +1,10 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t -- \
-// RUN: -config="{CheckOptions: [\
-// RUN: {key: 'misc-const-correctness.TransformValues', value: true}, \
-// RUN: {key: 'misc-const-correctness.TransformReferences', value: true}, \
-// RUN: {key: 'misc-const-correctness.WarnPointersAsValues', value: false}, \
-// RUN: {key: 'misc-const-correctness.TransformPointersAsValues', value: false}, \
-// RUN: ]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {\
+// RUN: misc-const-correctness.TransformValues: true, \
+// RUN: misc-const-correctness.TransformReferences: true, \
+// RUN: misc-const-correctness.WarnPointersAsValues: false, \
+// RUN: misc-const-correctness.TransformPointersAsValues: false} \
+// RUN: }" -- -fno-delayed-template-parsing
template <typename T>
void type_dependent_variables() {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-pointer-as-values.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-pointer-as-values.cpp
index 232323fc910d98..7a7d227b3741b7 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-pointer-as-values.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-pointer-as-values.cpp
@@ -1,9 +1,9 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t \
// RUN: -config='{CheckOptions: \
-// RUN: [{key: "misc-const-correctness.AnalyzeValues", value: true},\
-// RUN: {key: "misc-const-correctness.WarnPointersAsValues", value: true}, \
-// RUN: {key: "misc-const-correctness.TransformPointersAsValues", value: true},\
-// RUN: ]}' -- -fno-delayed-template-parsing
+// RUN: {misc-const-correctness.AnalyzeValues: true,\
+// RUN: misc-const-correctness.WarnPointersAsValues: true, \
+// RUN: misc-const-correctness.TransformPointersAsValues: true}\
+// RUN: }' -- -fno-delayed-template-parsing
void potential_const_pointer() {
double np_local0[10] = {0., 1., 2., 3., 4., 5., 6., 7., 8., 9.};
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-values.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-values.cpp
index 5b37a6abc1e47f..9a4eb010609b40 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-values.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-values.cpp
@@ -1,9 +1,9 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t -- \
-// RUN: -config="{CheckOptions: [\
-// RUN: {key: 'misc-const-correctness.TransformValues', value: true},\
-// RUN: {key: 'misc-const-correctness.WarnPointersAsValues', value: false}, \
-// RUN: {key: 'misc-const-correctness.TransformPointersAsValues', value: false}, \
-// RUN: ]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {\
+// RUN: misc-const-correctness.TransformValues: true,\
+// RUN: misc-const-correctness.WarnPointersAsValues: false, \
+// RUN: misc-const-correctness.TransformPointersAsValues: false} \
+// RUN: }" -- -fno-delayed-template-parsing
bool global;
char np_global = 0; // globals can't be known to be const
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-unaligned.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-unaligned.cpp
index 89374c624473f9..69139efa695496 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-unaligned.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-unaligned.cpp
@@ -1,9 +1,9 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t -- \
-// RUN: -config="{CheckOptions: [\
-// RUN: {key: 'misc-const-correctness.TransformValues', value: true}, \
-// RUN: {key: 'misc-const-correctness.WarnPointersAsValues', value: false}, \
-// RUN: {key: 'misc-const-correctness.TransformPointersAsValues', value: false}, \
-// RUN: ]}" -- -fno-delayed-template-parsing -fms-extensions
+// RUN: -config="{CheckOptions: {\
+// RUN: misc-const-correctness.TransformValues: true, \
+// RUN: misc-const-correctness.WarnPointersAsValues: false, \
+// RUN: misc-const-correctness.TransformPointersAsValues: false} \
+// RUN: }" -- -fno-delayed-template-parsing -fms-extensions
struct S {};
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp
index f469bfd055c932..88f40462003e88 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-values.cpp
@@ -1,9 +1,9 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t -- \
-// RUN: -config="{CheckOptions: [\
-// RUN: {key: 'misc-const-correctness.TransformValues', value: true}, \
-// RUN: {key: 'misc-const-correctness.WarnPointersAsValues', value: false}, \
-// RUN: {key: 'misc-const-correctness.TransformPointersAsValues', value: false}, \
-// RUN: ]}" -- -fno-delayed-template-parsing
+// RUN: -config="{CheckOptions: {\
+// RUN: misc-const-correctness.TransformValues: true, \
+// RUN: misc-const-correctness.WarnPointersAsValues: false, \
+// RUN: misc-const-correctness.TransformPointersAsValues: false} \
+// RUN: }" -- -fno-delayed-template-parsing
// ------- Provide test samples for primitive builtins ---------
// - every 'p_*' variable is a 'potential_const_*' variable
@@ -530,7 +530,7 @@ void range_for() {
void arrays_of_pointers_are_ignored() {
int *np_local0[2] = {nullptr, nullptr};
-
+
using intPtr = int*;
intPtr np_local1[2] = {nullptr, nullptr};
}
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-wrong-config.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-wrong-config.cpp
index f08be79c94f39c..29e92e52ca9c79 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-wrong-config.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-wrong-config.cpp
@@ -1,8 +1,8 @@
// RUN: %check_clang_tidy %s misc-const-correctness %t \
// RUN: -config='{CheckOptions: \
-// RUN: [{key: "misc-const-correctness.AnalyzeValues", value: false},\
-// RUN: {key: "misc-const-correctness.AnalyzeReferences", value: false},\
-// RUN: ]}' -- -fno-delayed-template-parsing
+// RUN: {"misc-const-correctness.AnalyzeValues": false,\
+// RUN: "misc-const-correctness.AnalyzeReferences": false}\
+// RUN: }' -- -fno-delayed-template-parsing
// CHECK-MESSAGES: warning: The check 'misc-const-correctness' will not perform any analysis because both 'AnalyzeValues' and 'AnalyzeReferences' are false. [clang-tidy-config]
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/header-include-cycle.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/header-include-cycle.cpp
index cdc15f8149d384..57f48d34ecdf69 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/header-include-cycle.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/header-include-cycle.cpp
@@ -5,7 +5,7 @@
// RUN: cp -r %S/Inputs/system/header-include-cycle* %T/misc-header-include-cycle-headers/system
// RUN: cp %s %T/header-include-cycle.cpp
// RUN: clang-tidy %T/header-include-cycle.cpp -checks='-*,misc-header-include-cycle' -header-filter=.* \
-// RUN: -config="{CheckOptions: [{key: misc-header-include-cycle.IgnoredFilesList, value: 'header-include-cycle.self-e.hpp'}]}" \
+// RUN: -config="{CheckOptions: {misc-header-include-cycle.IgnoredFilesList: 'header-include-cycle.self-e.hpp'}}" \
// RUN: -- -I%T/misc-header-include-cycle-headers -isystem %T/misc-header-include-cycle-headers/system \
// RUN: --include %T/misc-header-include-cycle-headers/header-include-cycle.self-i.hpp | FileCheck %s \
// RUN: -check-prefix=CHECK-MESSAGES "-implicit-check-not={{note|warning|error}}:" --dump-input=fail
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-virtual.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-virtual.cpp
index 0ba2965c9b04c3..a2bf9d91747369 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-virtual.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-virtual.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s misc-unused-parameters %t -- \
-// RUN: -config="{CheckOptions: [{key: misc-unused-parameters.IgnoreVirtual, value: true}]}" --
+// RUN: -config="{CheckOptions: {misc-unused-parameters.IgnoreVirtual: true}}" --
struct Base {
int f(int foo) {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-templates.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-templates.cpp
index 12f8cf447618b3..a06ada89641717 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-templates.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-override-templates.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s modernize-use-override %t -- \
-// RUN: -config="{CheckOptions: [{key: modernize-use-override.IgnoreTemplateInstantiations, value: true}]}"
+// RUN: -config="{CheckOptions: {modernize-use-override.IgnoreTemplateInstantiations: true}}"
struct Base {
virtual void foo();
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
index dd22811cdaaf48..95c32837e4447b 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-absl.cpp
@@ -1,10 +1,10 @@
// RUN: %check_clang_tidy \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: [{key: StrictMode, value: true}]}" \
+// RUN: -config="{CheckOptions: {StrictMode: true}}" \
// RUN: -- -isystem %clang_tidy_headers
// RUN: %check_clang_tidy \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: [{key: StrictMode, value: false}]}" \
+// RUN: -config="{CheckOptions: {StrictMode: false}}" \
// RUN: -- -isystem %clang_tidy_headers
#include <cstdio>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-custom.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-custom.cpp
index c6077a46b6e000..8466217b765a87 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-custom.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-custom.cpp
@@ -1,15 +1,9 @@
// RUN: %check_clang_tidy -std=c++23 %s modernize-use-std-print %t -- \
// RUN: -config="{CheckOptions: \
-// RUN: [ \
-// RUN: { \
-// RUN: key: modernize-use-std-print.PrintfLikeFunctions, \
-// RUN: value: 'unqualified_printf;::myprintf; mynamespace::myprintf2' \
-// RUN: }, \
-// RUN: { \
-// RUN: key: modernize-use-std-print.FprintfLikeFunctions, \
-// RUN: value: '::myfprintf; mynamespace::myfprintf2' \
-// RUN: } \
-// RUN: ] \
+// RUN: { \
+// RUN: modernize-use-std-print.PrintfLikeFunctions: 'unqualified_printf;::myprintf; mynamespace::myprintf2', \
+// RUN: modernize-use-std-print.FprintfLikeFunctions: '::myfprintf; mynamespace::myfprintf2' \
+// RUN: } \
// RUN: }" \
// RUN: -- -isystem %clang_tidy_headers
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-fmt.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-fmt.cpp
index 81a5631fd9d840..95ceb33889bfc0 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-fmt.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print-fmt.cpp
@@ -1,19 +1,10 @@
// RUN: %check_clang_tidy %s modernize-use-std-print %t -- \
// RUN: -config="{CheckOptions: \
-// RUN: [ \
-// RUN: { \
-// RUN: key: modernize-use-std-print.ReplacementPrintFunction, \
-// RUN: value: 'fmt::print' \
-// RUN: }, \
-// RUN: { \
-// RUN: key: modernize-use-std-print.ReplacementPrintlnFunction, \
-// RUN: value: 'fmt::println' \
-// RUN: }, \
-// RUN: { \
-// RUN: key: modernize-use-std-print.PrintHeader, \
-// RUN: value: '<fmt/core.h>' \
-// RUN: } \
-// RUN: ] \
+// RUN: { \
+// RUN: modernize-use-std-print.ReplacementPrintFunction: 'fmt::print', \
+// RUN: modernize-use-std-print.ReplacementPrintlnFunction: 'fmt::println', \
+// RUN: modernize-use-std-print.PrintHeader: '<fmt/core.h>' \
+// RUN: } \
// RUN: }" \
// RUN: -- -isystem %clang_tidy_headers
diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
index 321baeec7a6b09..30a63a6b867798 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-std-print.cpp
@@ -1,10 +1,10 @@
// RUN: %check_clang_tidy -check-suffixes=,STRICT \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: [{key: StrictMode, value: true}]}" \
+// RUN: -config="{CheckOptions: {StrictMode: true}}" \
// RUN: -- -isystem %clang_tidy_headers -fexceptions
// RUN: %check_clang_tidy -check-suffixes=,NOTSTRICT \
// RUN: -std=c++23 %s modernize-use-std-print %t -- \
-// RUN: -config="{CheckOptions: [{key: StrictMode, value: false}]}" \
+// RUN: -config="{CheckOptions: {StrictMode: false}}" \
// RUN: -- -isystem %clang_tidy_headers -fexceptions
#include <cstddef>
#include <cstdint>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance/enum-size.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance/enum-size.cpp
index 3ebef396096e20..37481a8141c5c4 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/performance/enum-size.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/performance/enum-size.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy -std=c++17-or-later %s performance-enum-size %t -- \
-// RUN: -config="{CheckOptions: [{key: performance-enum-size.EnumIgnoreList, value: '::IgnoredEnum;IgnoredSecondEnum'}]}"
+// RUN: -config="{CheckOptions: {performance-enum-size.EnumIgnoreList: '::IgnoredEnum;IgnoredSecondEnum'}}"
namespace std
{
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls-macros.cpp
index 326f3d8b59d1b4..2333d9f65602e5 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/avoid-const-params-in-decls-macros.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s readability-avoid-const-params-in-decls %t -- \
-// RUN: -config="{CheckOptions: [{key: readability-avoid-const-params-in-decls.IgnoreMacros, value: false}]}"
+// RUN: -config="{CheckOptions: {readability-avoid-const-params-in-decls.IgnoreMacros: false}}"
// Regression tests involving macros
#define CONCAT(a, b) a##b
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type-macros.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type-macros.cpp
index d1b33bca64298a..5131011118f301 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type-macros.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/const-return-type-macros.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy -std=c++14-or-later %s readability-const-return-type %t -- \
-// RUN: -config="{CheckOptions: [{key: readability-const-return-type.IgnoreMacros, value: false}]}"
+// RUN: -config="{CheckOptions: {readability-const-return-type.IgnoreMacros: false}}"
// p# = positive test
// n# = negative test
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp
index 30df8acb8cd13e..7d8500ed4affe3 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/container-data-pointer.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy -check-suffixes=,CLASSIC %s readability-container-data-pointer %t -- -- -isystem %clang_tidy_headers -fno-delayed-template-parsing
-// RUN: %check_clang_tidy -check-suffixes=,WITH-CONFIG %s readability-container-data-pointer %t -- -config="{CheckOptions: [{key: readability-container-data-pointer.IgnoredContainers, value: '::std::basic_string'}]}" -- -isystem %clang_tidy_headers -fno-delayed-template-parsing
+// RUN: %check_clang_tidy -check-suffixes=,WITH-CONFIG %s readability-container-data-pointer %t -- -config="{CheckOptions: {readability-container-data-pointer.IgnoredContainers: '::std::basic_string'}}" -- -isystem %clang_tidy_headers -fno-delayed-template-parsing
#include <string>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
index 28ce8d5f8cd32d..ae67bf2e92eb0d 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/container-size-empty.cpp
@@ -1,5 +1,5 @@
// RUN: %check_clang_tidy %s readability-container-size-empty %t -- \
-// RUN: -config="{CheckOptions: [{key: readability-container-size-empty.ExcludedComparisonTypes , value: '::std::array;::IgnoredDummyType'}]}" \
+// RUN: -config="{CheckOptions: {readability-container-size-empty.ExcludedComparisonTypes: '::std::array;::IgnoredDummyType'}}" \
// RUN: -- -fno-delayed-template-parsing -isystem %clang_tidy_headers
#include <string>
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp
index 12ce9cbc9476e2..3d38e29bd03d55 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/magic-numbers-userliteral.cpp
@@ -1,10 +1,10 @@
// RUN: %check_clang_tidy -check-suffixes=UDL-ALLOWED -std=c++14-or-later %s readability-magic-numbers %t \
// RUN: -config='{CheckOptions: \
-// RUN: [{key: readability-magic-numbers.IgnoreUserDefinedLiterals, value: false}]}' \
+// RUN: {readability-magic-numbers.IgnoreUserDefinedLiterals: false}}' \
// RUN: --
// RUN: %check_clang_tidy -check-suffixes=UDL-IGNORED -std=c++14-or-later %s readability-magic-numbers %t \
// RUN: -config='{CheckOptions: \
-// RUN: [{key: readability-magic-numbers.IgnoreUserDefinedLiterals, value: true}]}' \
+// RUN: {readability-magic-numbers.IgnoreUserDefinedLiterals: true}}' \
// RUN: --
namespace std {
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-alternative.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-alternative.cpp
index ebaa30dbe29c22..5f70844fdfefc2 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-alternative.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-alternative.cpp
@@ -1,6 +1,6 @@
-// RUN: %check_clang_tidy %s readability-operators-representation %t -- -config="{CheckOptions: [\
-// RUN: {key: readability-operators-representation.BinaryOperators, value: 'and;and_eq;bitand;bitor;compl;not;not_eq;or;or_eq;xor;xor_eq'}, \
-// RUN: {key: readability-operators-representation.OverloadedOperators, value: 'and;and_eq;bitand;bitor;compl;not;not_eq;or;or_eq;xor;xor_eq'}]}" --
+// RUN: %check_clang_tidy %s readability-operators-representation %t -- -config="{CheckOptions: {\
+// RUN: readability-operators-representation.BinaryOperators: 'and;and_eq;bitand;bitor;compl;not;not_eq;or;or_eq;xor;xor_eq', \
+// RUN: readability-operators-representation.OverloadedOperators: 'and;and_eq;bitand;bitor;compl;not;not_eq;or;or_eq;xor;xor_eq'}}" --
void testAllTokensToAlternative(int a, int b) {
int value = 0;
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-traditional.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-traditional.cpp
index e1e47dbf2268f4..5c421a03966121 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-traditional.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/operators-representation-to-traditional.cpp
@@ -1,6 +1,6 @@
-// RUN: %check_clang_tidy %s readability-operators-representation %t -- -config="{CheckOptions: [\
-// RUN: {key: readability-operators-representation.BinaryOperators, value: '&&;&=;&;|;~;!;!=;||;|=;^;^='}, \
-// RUN: {key: readability-operators-representation.OverloadedOperators, value: '&&;&=;&;|;~;!;!=;||;|=;^;^='}]}" --
+// RUN: %check_clang_tidy %s readability-operators-representation %t -- -config="{CheckOptions: {\
+// RUN: readability-operators-representation.BinaryOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^=', \
+// RUN: readability-operators-representation.OverloadedOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='}}" --
void testAllTokensToAlternative(int a, int b) {
int value = 0;
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-function.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-function.cpp
index 04e035cdbb6262..bc12fd5fdf91fd 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-function.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/redundant-string-cstr-function.cpp
@@ -1,7 +1,7 @@
// RUN: %check_clang_tidy %s readability-redundant-string-cstr %t -- \
// RUN: -config="{CheckOptions: \
-// RUN: [{key: readability-redundant-string-cstr.StringParameterFunctions, \
-// RUN: value: '::fmt::format; ::fmt::print; ::BaseLogger::operator(); ::BaseLogger::Log'}] \
+// RUN: {readability-redundant-string-cstr.StringParameterFunctions: \
+// RUN: '::fmt::format; ::fmt::print; ::BaseLogger::operator(); ::BaseLogger::Log'} \
// RUN: }" \
// RUN: -- -isystem %clang_tidy_headers
#include <string>
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/.clang-tidy
index c670d32da0a43e..74556fa4be845c 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/.clang-tidy
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/.clang-tidy
@@ -1,8 +1,5 @@
Checks: '-*,modernize-loop-convert,modernize-use-using'
CheckOptions:
- - key: modernize-loop-convert.MaxCopySize
- value: '10'
- - key: modernize-loop-convert.MinConfidence
- value: reasonable
- - key: modernize-use-using.IgnoreMacros
- value: true
+ modernize-loop-convert.MaxCopySize: '10'
+ modernize-loop-convert.MinConfidence: reasonable
+ modernize-use-using.IgnoreMacros: true
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/44/.clang-tidy b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/44/.clang-tidy
index 8b3cf08d7258ac..eb92c1146d6a80 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/44/.clang-tidy
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/Inputs/config-files/4/44/.clang-tidy
@@ -1,9 +1,6 @@
InheritParentConfig: true
Checks: 'llvm-qualified-auto'
CheckOptions:
- - key: modernize-loop-convert.MaxCopySize
- value: '20'
- - key: llvm-qualified-auto.AddConstToQualified
- value: 'true'
- - key: IgnoreMacros
- value: 'false'
+ modernize-loop-convert.MaxCopySize: '20'
+ llvm-qualified-auto.AddConstToQualified: 'true'
+ IgnoreMacros: 'false'
diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/dump-config-invalid.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/dump-config-invalid.cpp
index eba40b8d61187f..4737b49bffe44f 100644
--- a/clang-tools-extra/test/clang-tidy/infrastructure/dump-config-invalid.cpp
+++ b/clang-tools-extra/test/clang-tidy/infrastructure/dump-config-invalid.cpp
@@ -1,6 +1,6 @@
// RUN: clang-tidy --checks="-*,modernize-make-shared" \
-// RUN: --config="CheckOptions: [{ \
-// RUN: key: modernize-make-shared.IncludeStyle, value: '0' }]" \
+// RUN: --config="CheckOptions: { \
+// RUN: modernize-make-shared.IncludeStyle: '0' }" \
// RUN: --dump-config -- | FileCheck %s
// CHECK: modernize-make-shared.IncludeStyle: llvm
More information about the cfe-commits
mailing list