[clang-tidy][NFC] Update tests to specify CheckOptions using new syntax

In D128337, The spelling of CheckOptions was updated to support a more natural dictionary syntax.
This patch is just updating all test files to use the new syntax.

Reviewed By: PiotrZSL

Differential Revision: https://reviews.llvm.org/D130209

clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-startswith.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s abseil-string-find-startswith %t -- \
-// RUN:   -config="{CheckOptions: [{key: 'abseil-string-find-startswith.StringLikeClasses', value: '::std::basic_string;::basic_string'}]}"
+// RUN:   -config="{CheckOptions: {abseil-string-find-startswith.StringLikeClasses: '::std::basic_string;::basic_string'}}"
 
 using size_t = decltype(sizeof(int));
 

clang-tools-extra/test/clang-tidy/checkers/abseil/string-find-str-contains.cpp

@@ -1,5 +1,4 @@
-// RUN: %check_clang_tidy %s abseil-string-find-str-contains %t -- \
-// RUN:   -config="{CheckOptions: []}"
+// RUN: %check_clang_tidy %s abseil-string-find-str-contains %t --
 
 using size_t = decltype(sizeof(int));
 

clang-tools-extra/test/clang-tidy/checkers/altera/single-work-item-barrier.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy -check-suffix=OLDCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLOLDAOC
 // RUN: %check_clang_tidy -check-suffix=NEWCLOLDAOC %s altera-single-work-item-barrier %t -- -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLOLDAOC
-// RUN: %check_clang_tidy -check-suffix=OLDCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLNEWAOC
-// RUN: %check_clang_tidy -check-suffix=NEWCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: [{key: altera-single-work-item-barrier.AOCVersion, value: 1701}]}' -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLNEWAOC
+// RUN: %check_clang_tidy -check-suffix=OLDCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: { altera-single-work-item-barrier.AOCVersion: 1701}}' -header-filter=.* "--" -cl-std=CL1.2 -c -DOLDCLNEWAOC
+// RUN: %check_clang_tidy -check-suffix=NEWCLNEWAOC %s altera-single-work-item-barrier %t -- -config='{CheckOptions: { altera-single-work-item-barrier.AOCVersion: 1701}}' -header-filter=.* "--" -cl-std=CL2.0 -c -DNEWCLNEWAOC
 
 #ifdef OLDCLOLDAOC  // OpenCL 1.2 Altera Offline Compiler < 17.1
 void __kernel error_barrier_no_id(__global int * foo, int size) {

clang-tools-extra/test/clang-tidy/checkers/altera/unroll-loops.cpp

@@ -1,5 +1,5 @@
-// RUN: %check_clang_tidy %s altera-unroll-loops %t -- -config="{CheckOptions: [{key: "altera-unroll-loops.MaxLoopIterations", value: 50}]}" -header-filter=.*
-// RUN: %check_clang_tidy -check-suffix=MULT %s altera-unroll-loops %t -- -config="{CheckOptions: [{key: "altera-unroll-loops.MaxLoopIterations", value: 5}]}" -header-filter=.* "--" -DMULT
+// RUN: %check_clang_tidy %s altera-unroll-loops %t -- -config="{CheckOptions: {altera-unroll-loops.MaxLoopIterations: 50}}" -header-filter=.*
+// RUN: %check_clang_tidy -check-suffix=MULT %s altera-unroll-loops %t -- -config="{CheckOptions: {altera-unroll-loops.MaxLoopIterations: 5}}" -header-filter=.* "--" -DMULT
 
 #ifdef MULT
 // For loops with *= and /= increments.

clang-tools-extra/test/clang-tidy/checkers/android/comparison-in-temp-failure-retry-custom-macro.c

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s android-comparison-in-temp-failure-retry %t -- -config="{CheckOptions: [{key: android-comparison-in-temp-failure-retry.RetryMacros, value: 'MY_TEMP_FAILURE_RETRY,MY_OTHER_TEMP_FAILURE_RETRY'}]}"
+// RUN: %check_clang_tidy %s android-comparison-in-temp-failure-retry %t -- -config="{CheckOptions: {android-comparison-in-temp-failure-retry.RetryMacros: 'MY_TEMP_FAILURE_RETRY,MY_OTHER_TEMP_FAILURE_RETRY'}}"
 
 #define MY_TEMP_FAILURE_RETRY(x) \
   ({                             \

clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-ignore-single-argument.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:     {key: bugprone-argument-comment.IgnoreSingleArgument, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentBoolLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentIntegerLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentFloatLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentStringLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentNullPtrs, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentCharacterLiterals, value: true}]}" --
+// RUN:   -config="{CheckOptions: { \
+// RUN:     bugprone-argument-comment.IgnoreSingleArgument: true, \
+// RUN:     bugprone-argument-comment.CommentBoolLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentIntegerLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentFloatLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentUserDefinedLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentStringLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentNullPtrs: true, \
+// RUN:     bugprone-argument-comment.CommentCharacterLiterals: true}}" --
 
 struct A {
   void foo(bool abc);

clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-literals.cpp

@@ -1,12 +1,12 @@
 // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:     {key: bugprone-argument-comment.CommentBoolLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentIntegerLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentFloatLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentStringLiterals, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentNullPtrs, value: true}, \
-// RUN:     {key: bugprone-argument-comment.CommentCharacterLiterals, value: true}]}" --
+// RUN:   -config="{CheckOptions: { \
+// RUN:     bugprone-argument-comment.CommentBoolLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentIntegerLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentFloatLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentUserDefinedLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentStringLiterals: true, \
+// RUN:     bugprone-argument-comment.CommentNullPtrs: true, \
+// RUN:     bugprone-argument-comment.CommentCharacterLiterals: true}}" --
 
 struct A {
   void foo(bool abc);

clang-tools-extra/test/clang-tidy/checkers/bugprone/argument-comment-strict.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
-// RUN:   -config="{CheckOptions: [{key: StrictMode, value: true}]}" --
+// RUN:   -config="{CheckOptions: {StrictMode: true}}" --
 
 void f(int _with_underscores_);
 void g(int x_);

clang-tools-extra/test/clang-tidy/checkers/bugprone/assert-side-effect.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-assert-side-effect %t -- -config="{CheckOptions: [{key: bugprone-assert-side-effect.CheckFunctionCalls, value: true}, {key: bugprone-assert-side-effect.AssertMacros, value: 'assert,assert2,my_assert,convoluted_assert,msvc_assert'}, {key: bugprone-assert-side-effect.IgnoredFunctions, value: 'MyClass::badButIgnoredFunc'}]}" -- -fexceptions -I %S/Inputs/assert-side-effect
+// RUN: %check_clang_tidy %s bugprone-assert-side-effect %t -- -config="{CheckOptions: {bugprone-assert-side-effect.CheckFunctionCalls: true, bugprone-assert-side-effect.AssertMacros: 'assert,assert2,my_assert,convoluted_assert,msvc_assert', bugprone-assert-side-effect.IgnoredFunctions: 'MyClass::badButIgnoredFunc'}}" -- -fexceptions -I %S/Inputs/assert-side-effect
 #include <assert.h>
 
 bool badButIgnoredFunc(int a, int b) { return a * b > 0; }

clang-tools-extra/test/clang-tidy/checkers/bugprone/dangling-handle.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy -std=c++11,c++14 %s bugprone-dangling-handle %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: bugprone-dangling-handle.HandleClasses, \
-// RUN:               value: 'std::basic_string_view; ::llvm::StringRef;'}]}"
+// RUN:             {bugprone-dangling-handle.HandleClasses: \
+// RUN:               'std::basic_string_view; ::llvm::StringRef;'}}"
 // FIXME: Fix the checker to work in C++17 or later mode.
 
 namespace std {

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-ignore.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: "\"\";Foo;Bar"}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: "T"}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "\"\";Foo;Bar", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "T", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 void ignoredUnnamed(int I, int, int) {} // NO-WARN: No >= 2 length of non-unnamed.
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicit-qualifiers.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 1, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 1, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 void numericAndQualifierConversion(int I, const double CD) { numericAndQualifierConversion(CD, I); }
 // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 2 adjacent parameters of 'numericAndQualifierConversion' of convertible types are easily swapped by mistake [bugprone-easily-swappable-parameters]

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.c

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 1, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 void implicitDoesntBreakOtherStuff(int A, int B) {}
 // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 2 adjacent parameters of 'implicitDoesntBreakOtherStuff' of similar type ('int') are easily swapped by mistake [bugprone-easily-swappable-parameters]

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-implicits.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy -std=c++17-or-later %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 1, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 void implicitDoesntBreakOtherStuff(int A, int B) {}
 // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 2 adjacent parameters of 'implicitDoesntBreakOtherStuff' of similar type ('int') are easily swapped by mistake [bugprone-easily-swappable-parameters]

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len2.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 namespace std {
 using size_t = decltype(sizeof(int));

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-len3.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 3}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 3, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 int add(int Left, int Right) { return Left + Right; } // NO-WARN: Only 2 parameters.
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-prefixsuffixname.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 1} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 1 \
+// RUN:  }}' --
 
 namespace std {
 struct string {};

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-qualifiermixing.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 1, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 typedef int MyInt1;
 typedef int MyInt2;

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.c

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' -- -Wno-strict-prototypes -x c
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 1, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' -- -Wno-strict-prototypes -x c
 
 int myprint();
 int add(int X, int Y);

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters-relatedness.cpp

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 1}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' --
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 1, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' --
 
 namespace std {
 template <typename T>

clang-tools-extra/test/clang-tidy/checkers/bugprone/easily-swappable-parameters.c

@@ -1,13 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-easily-swappable-parameters %t \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-easily-swappable-parameters.MinimumLength, value: 2}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterNames, value: ""}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes, value: "bool;MyBool;struct U;MAKE_LOGICAL_TYPE(int)"}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.QualifiersMix, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.ModelImplicitConversions, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.SuppressParametersUsedTogether, value: 0}, \
-// RUN:     {key: bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold, value: 0} \
-// RUN:  ]}' -- -Wno-strict-prototypes -x c
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-easily-swappable-parameters.MinimumLength: 2, \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterNames: "", \
+// RUN:     bugprone-easily-swappable-parameters.IgnoredParameterTypeSuffixes: "bool;MyBool;struct U;MAKE_LOGICAL_TYPE(int)", \
+// RUN:     bugprone-easily-swappable-parameters.QualifiersMix: 0, \
+// RUN:     bugprone-easily-swappable-parameters.ModelImplicitConversions: 0, \
+// RUN:     bugprone-easily-swappable-parameters.SuppressParametersUsedTogether: 0, \
+// RUN:     bugprone-easily-swappable-parameters.NamePrefixSuffixSilenceDissimilarityTreshold: 0 \
+// RUN:  }}' -- -Wno-strict-prototypes -x c
 
 #define bool _Bool
 #define true 1

clang-tools-extra/test/clang-tidy/checkers/bugprone/exception-escape.cpp

@@ -1,8 +1,8 @@
 // RUN: %check_clang_tidy -std=c++11,c++14 %s bugprone-exception-escape %t -- \
-// RUN:     -config="{CheckOptions: [ \
-// RUN:         {key: bugprone-exception-escape.IgnoredExceptions, value: 'ignored1,ignored2'}, \
-// RUN:         {key: bugprone-exception-escape.FunctionsThatShouldNotThrow, value: 'enabled1,enabled2,enabled3'} \
-// RUN:     ]}" \
+// RUN:     -config="{CheckOptions: { \
+// RUN:         bugprone-exception-escape.IgnoredExceptions: 'ignored1,ignored2', \
+// RUN:         bugprone-exception-escape.FunctionsThatShouldNotThrow: 'enabled1,enabled2,enabled3' \
+// RUN:     }}" \
 // RUN:     -- -fexceptions
 // FIXME: Fix the checker to work in C++17 or later mode.
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-array-subscript-expression.cpp

@@ -2,13 +2,13 @@
 // RUN: %check_clang_tidy -check-suffixes=ALL,CXX %s bugprone-implicit-widening-of-multiplication-result %t -- -- -target x86_64-unknown-unknown -x c++
 
 // RUN: %check_clang_tidy -check-suffixes=ALL,C -std=c99 %s bugprone-implicit-widening-of-multiplication-result %t -- \
-// RUN:     -config='{CheckOptions: [ \
-// RUN:         {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \
-// RUN:     ]}' -- -target x86_64-unknown-unknown -x c
+// RUN:     -config='{CheckOptions: { \
+// RUN:         bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \
+// RUN:     }}' -- -target x86_64-unknown-unknown -x c
 // RUN: %check_clang_tidy -check-suffixes=ALL,C %s bugprone-implicit-widening-of-multiplication-result %t -- \
-// RUN:     -config='{CheckOptions: [ \
-// RUN:         {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \
-// RUN:     ]}' -- -target x86_64-unknown-unknown -x c++
+// RUN:     -config='{CheckOptions: { \
+// RUN:         bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \
+// RUN:     }}' -- -target x86_64-unknown-unknown -x c++
 
 char *t0(char *base, int a, int b) {
   return &base[a * b];

clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-int.cpp

@@ -2,13 +2,13 @@
 // RUN: %check_clang_tidy -check-suffixes=ALL,CXX %s bugprone-implicit-widening-of-multiplication-result %t -- -- -target x86_64-unknown-unknown -x c++
 
 // RUN: %check_clang_tidy -check-suffixes=ALL,C -std=c99 %s bugprone-implicit-widening-of-multiplication-result %t -- \
-// RUN:     -config='{CheckOptions: [ \
-// RUN:         {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \
-// RUN:     ]}' -- -target x86_64-unknown-unknown -x c
+// RUN:     -config='{CheckOptions: { \
+// RUN:         bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \
+// RUN:     }}' -- -target x86_64-unknown-unknown -x c
 // RUN: %check_clang_tidy -check-suffixes=ALL,C %s bugprone-implicit-widening-of-multiplication-result %t -- \
-// RUN:     -config='{CheckOptions: [ \
-// RUN:         {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \
-// RUN:     ]}' -- -target x86_64-unknown-unknown -x c++
+// RUN:     -config='{CheckOptions: { \
+// RUN:         bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \
+// RUN:     }}' -- -target x86_64-unknown-unknown -x c++
 
 long t0(int a, int b) {
   return a * b;

clang-tools-extra/test/clang-tidy/checkers/bugprone/implicit-widening-of-multiplication-result-pointer-offset.cpp

@@ -2,13 +2,13 @@
 // RUN: %check_clang_tidy -check-suffixes=ALL,CXX %s bugprone-implicit-widening-of-multiplication-result %t -- -- -target x86_64-unknown-unknown -x c++
 
 // RUN: %check_clang_tidy -check-suffixes=ALL,C -std=c99 %s bugprone-implicit-widening-of-multiplication-result %t -- \
-// RUN:     -config='{CheckOptions: [ \
-// RUN:         {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \
-// RUN:     ]}' -- -target x86_64-unknown-unknown -x c
+// RUN:     -config='{CheckOptions: { \
+// RUN:         bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \
+// RUN:     }}' -- -target x86_64-unknown-unknown -x c
 // RUN: %check_clang_tidy -check-suffixes=ALL,C %s bugprone-implicit-widening-of-multiplication-result %t -- \
-// RUN:     -config='{CheckOptions: [ \
-// RUN:         {key: bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources, value: false} \
-// RUN:     ]}' -- -target x86_64-unknown-unknown -x c++
+// RUN:     -config='{CheckOptions: { \
+// RUN:         bugprone-implicit-widening-of-multiplication-result.UseCXXStaticCastsInCppSources: false \
+// RUN:     }}' -- -target x86_64-unknown-unknown -x c++
 
 char *t0(char *base, int a, int b) {
   return base + a * b;

clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-explicit-only.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: [{key: bugprone-misplaced-widening-cast.CheckImplicitCasts, value: false}]}" --
+// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: {bugprone-misplaced-widening-cast.CheckImplicitCasts: false}}" --
 
 void func(long arg) {}
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/misplaced-widening-cast-implicit-enabled.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: [{key: bugprone-misplaced-widening-cast.CheckImplicitCasts, value: true}]}" --
+// RUN: %check_clang_tidy %s bugprone-misplaced-widening-cast %t -- -config="{CheckOptions: {bugprone-misplaced-widening-cast.CheckImplicitCasts: true}}" --
 
 void func(long arg) {}
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-memcpy-before-safe.c

@@ -1,7 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-not-null-terminated-result %t -- \
 // RUN: -config="{CheckOptions: \
-// RUN: [{key: bugprone-not-null-terminated-result.WantToUseSafeFunctions, \
-// RUN:   value: true}]}" \
+// RUN: {bugprone-not-null-terminated-result.WantToUseSafeFunction: true}}" \
 // RUN: -- -std=c11 -I %S/Inputs/not-null-terminated-result
 
 #include "not-null-terminated-result-c.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone/reserved-identifier-invert.cpp

@@ -1,8 +1,8 @@
 // RUN: %check_clang_tidy %s bugprone-reserved-identifier %t -- \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: bugprone-reserved-identifier.Invert, value: true}, \
-// RUN:     {key: bugprone-reserved-identifier.AllowedIdentifiers, value: "std;reference_wrapper;^c?ref;type;get"}, \
-// RUN:   ]}' -- \
+// RUN:   -config='{CheckOptions: { \
+// RUN:     bugprone-reserved-identifier.Invert: true, \
+// RUN:     bugprone-reserved-identifier.AllowedIdentifiers: "std;reference_wrapper;ref;^c?ref;type;get" \
+// RUN:   }}' -- \
 // RUN:   -I%S/Inputs/reserved-identifier \
 // RUN:   -isystem %S/Inputs/reserved-identifier/system
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-minimal.c

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-signal-handler %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "minimal"}]}' \
+// RUN:  {bugprone-signal-handler.AsyncSafeFunctionSet: "minimal"}}' \
 // RUN: -- -isystem %clang_tidy_headers
 
 #include "signal.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone/signal-handler-posix.c

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-signal-handler %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: bugprone-signal-handler.AsyncSafeFunctionSet, value: "POSIX"}]}' \
+// RUN:  {bugprone-signal-handler.AsyncSafeFunctionSet: "POSIX"}}' \
 // RUN: -- -isystem %clang_tidy_headers
 
 #include "signal.h"

clang-tools-extra/test/clang-tidy/checkers/bugprone/signed-char-misuse-with-option.cpp

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-signed-char-misuse %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: bugprone-signed-char-misuse.CharTypdefsToIgnore, value: "sal_Int8;int8_t"}]}' \
+// RUN:  {bugprone-signed-char-misuse.CharTypdefsToIgnore: "sal_Int8;int8_t"}}' \
 // RUN: --
 
 ///////////////////////////////////////////////////////////////////

clang-tools-extra/test/clang-tidy/checkers/bugprone/sizeof-expression.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-sizeof-expression %t -- -config="{CheckOptions: [{key: bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression, value: true}]}" --
+// RUN: %check_clang_tidy %s bugprone-sizeof-expression %t -- -config="{CheckOptions: {bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression: true}}" --
 
 class C {
   int size() { return sizeof(this); }

clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage-strict.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: [{key: bugprone-suspicious-enum-usage.StrictMode, value: true}]}" --
+// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: {bugprone-suspicious-enum-usage.StrictMode: true}}" --
 
 enum A {
   A = 1,

clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-enum-usage.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: [{key: bugprone-suspicious-enum-usage.StrictMode, value: false}]}" --
+// RUN: %check_clang_tidy %s bugprone-suspicious-enum-usage %t -- -config="{CheckOptions: {bugprone-suspicious-enum-usage.StrictMode: false}}" --
 
 enum Empty {
 };

clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.c

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s bugprone-suspicious-string-compare %t -- \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: bugprone-suspicious-string-compare.WarnOnImplicitComparison, value: true}, \
-// RUN:   {key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison, value: true}]}' \
+// RUN:  {bugprone-suspicious-string-compare.WarnOnImplicitComparison: true, \
+// RUN:   bugprone-suspicious-string-compare.WarnOnLogicalNotComparison: true}}' \
 // RUN: -- -std=c99
 
 static const char A[] = "abc";

clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-string-compare.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s bugprone-suspicious-string-compare %t -- \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: bugprone-suspicious-string-compare.WarnOnImplicitComparison, value: true}, \
-// RUN:   {key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison, value: true}]}' \
+// RUN:  {bugprone-suspicious-string-compare.WarnOnImplicitComparison: true, \
+// RUN:   bugprone-suspicious-string-compare.WarnOnLogicalNotComparison: true}}' \
 // RUN: --
 
 typedef __SIZE_TYPE__ size;

clang-tools-extra/test/clang-tidy/checkers/bugprone/too-small-loop-variable.cpp

@@ -1,7 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-too-small-loop-variable %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: bugprone-too-small-loop-variable.MagnitudeBitsUpperLimit, \
-// RUN:               value: 1024}]}" \
+// RUN:             {bugprone-too-small-loop-variable.MagnitudeBitsUpperLimit: 1024}}" \
 // RUN:   -- --target=x86_64-linux
 
 long size() { return 294967296l; }

clang-tools-extra/test/clang-tidy/checkers/bugprone/unhandled-self-assignment-warn-only-if-this-has-suspicious-field.cpp

@@ -1,7 +1,6 @@
 // RUN: %check_clang_tidy %s bugprone-unhandled-self-assignment %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: bugprone-unhandled-self-assignment.WarnOnlyIfThisHasSuspiciousField, \
-// RUN:               value: false}]}"
+// RUN:             {bugprone-unhandled-self-assignment.WarnOnlyIfThisHasSuspiciousField: false}}"
 
 // Classes with pointer field are still caught.
 class PtrField {

clang-tools-extra/test/clang-tidy/checkers/bugprone/unused-return-value-custom.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s bugprone-unused-return-value %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: bugprone-unused-return-value.CheckedFunctions, \
-// RUN:    value: "::fun;::ns::Outer::Inner::memFun;::ns::Type::staticFun;::ns::ClassTemplate::memFun;::ns::ClassTemplate::staticFun"}]}' \
+// RUN:  {bugprone-unused-return-value.CheckedFunctions: \
+// RUN:    "::fun;::ns::Outer::Inner::memFun;::ns::Type::staticFun;::ns::ClassTemplate::memFun;::ns::ClassTemplate::staticFun"}}' \
 // RUN: --
 
 namespace std {

clang-tools-extra/test/clang-tidy/checkers/cert/msc32-c.c

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s cert-msc32-c %t -- -config="{CheckOptions: [{key: cert-msc32-c.DisallowedSeedTypes, value: 'some_type,time_t'}]}" -- -std=c99
+// RUN: %check_clang_tidy %s cert-msc32-c %t -- -config="{CheckOptions: {cert-msc32-c.DisallowedSeedTypes: 'some_type,time_t'}}" -- -std=c99
 
 void srand(int seed);
 typedef int time_t;

clang-tools-extra/test/clang-tidy/checkers/cert/msc51-cpp.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s cert-msc51-cpp %t -- \
-// RUN:     -config="{CheckOptions: [{key: cert-msc51-cpp.DisallowedSeedTypes, value: 'some_type,time_t'}]}"
+// RUN:     -config="{CheckOptions: {cert-msc51-cpp.DisallowedSeedTypes: 'some_type,time_t'}}"
 
 namespace std {
 

clang-tools-extra/test/clang-tidy/checkers/cert/oop57-cpp.cpp

@@ -1,8 +1,8 @@
 // RUN: %check_clang_tidy %s cert-oop57-cpp %t -- \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: cert-oop57-cpp.MemSetNames, value: mymemset}, \
-// RUN:  {key: cert-oop57-cpp.MemCpyNames, value: mymemcpy}, \
-// RUN:  {key: cert-oop57-cpp.MemCmpNames, value: mymemcmp}]}' \
+// RUN:  {cert-oop57-cpp.MemSetNames: mymemset, \
+// RUN:  cert-oop57-cpp.MemCpyNames: mymemcpy, \
+// RUN:  cert-oop57-cpp.MemCmpNames: mymemcmp}}' \
 // RUN: --
 
 void mymemset(void *, unsigned char, decltype(sizeof(int)));

clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-glibc.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: [{key: "concurrency-mt-unsafe.FunctionSet", value: "glibc"}]}'
+// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: {concurrency-mt-unsafe.FunctionSet: "glibc"}}'
 
 extern unsigned int sleep (unsigned int __seconds);
 extern int *gmtime (const int *__timer);

clang-tools-extra/test/clang-tidy/checkers/concurrency/mt-unsafe-posix.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: [{key: "concurrency-mt-unsafe.FunctionSet", value: "posix"}]}'
+// RUN: %check_clang_tidy %s concurrency-mt-unsafe %t -- -config='{CheckOptions: {concurrency-mt-unsafe.FunctionSet: "posix"}}'
 
 extern unsigned int sleep (unsigned int __seconds);
 extern int *gmtime (const int *__timer);

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-caps-only.cpp

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-macro-usage %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: cppcoreguidelines-macro-usage.CheckCapsOnly, value: true}]}' --
+// RUN:  {cppcoreguidelines-macro-usage.CheckCapsOnly: true}}' --
 
 #ifndef INCLUDE_GUARD
 #define INCLUDE_GUARD

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-command-line-macros.cpp

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy -check-suffixes=NORMAL %s cppcoreguidelines-macro-usage %t -- -- -D_ZZZ_IM_A_MACRO
-// RUN: %check_clang_tidy -check-suffixes=NORMAL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: [{key: cppcoreguidelines-macro-usage.IgnoreCommandLineMacros, value: true}]}' -- -D_ZZZ_IM_A_MACRO
-// RUN: %check_clang_tidy -check-suffixes=NORMAL,CL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: [{key: cppcoreguidelines-macro-usage.IgnoreCommandLineMacros, value: false}]}' -- -D_ZZZ_IM_A_MACRO
+// RUN: %check_clang_tidy -check-suffixes=NORMAL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: {cppcoreguidelines-macro-usage.IgnoreCommandLineMacros: true}}' -- -D_ZZZ_IM_A_MACRO
+// RUN: %check_clang_tidy -check-suffixes=NORMAL,CL %s cppcoreguidelines-macro-usage %t -- -config='{CheckOptions: {cppcoreguidelines-macro-usage.IgnoreCommandLineMacros: false}}' -- -D_ZZZ_IM_A_MACRO
 
 // CHECK-MESSAGES-CL: warning: macro '_ZZZ_IM_A_MACRO' used to declare a constant; consider using a 'constexpr' constant
 

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/macro-usage-custom.cpp

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-macro-usage %t \
 // RUN: -config="{CheckOptions: \
-// RUN:  [{key: cppcoreguidelines-macro-usage.AllowedRegexp, value: 'DEBUG_*|TEST_*'}]}" --
+// RUN:  {cppcoreguidelines-macro-usage.AllowedRegexp: 'DEBUG_*|TEST_*'}}" --
 
 #ifndef INCLUDE_GUARD
 #define INCLUDE_GUARD

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-equivalentbitwidth-option.cpp

@@ -1,13 +1,10 @@
 // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \
-// RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [ \
-// RUN: ]}'
+// RUN: cppcoreguidelines-narrowing-conversions %t -- 
 
 // RUN: %check_clang_tidy -check-suffix=DISABLED %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [ \
-// RUN:   {key: cppcoreguidelines-narrowing-conversions.WarnOnEquivalentBitWidth, value: 0} \
-// RUN: ]}'
+// RUN: -config='{CheckOptions: { \
+// RUN:   cppcoreguidelines-narrowing-conversions.WarnOnEquivalentBitWidth: 0}}'
 
 void narrowing_equivalent_bitwidth() {
   int i;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-ignoreconversionfromtypes-option.cpp

@@ -1,13 +1,11 @@
 // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \
-// RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [ \
-// RUN: ]}'
+// RUN: cppcoreguidelines-narrowing-conversions %t --
 
 // RUN: %check_clang_tidy -check-suffix=IGNORED %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [ \
-// RUN:   {key: cppcoreguidelines-narrowing-conversions.IgnoreConversionFromTypes, value: "global_size_t;nested_size_type"} \
-// RUN: ]}'
+// RUN: -config='{CheckOptions: { \
+// RUN:   cppcoreguidelines-narrowing-conversions.IgnoreConversionFromTypes: "global_size_t;nested_size_type" \
+// RUN: }}'
 
 // We use global_size_t instead of 'size_t' because windows predefines size_t.
 typedef long long global_size_t;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-intemplates-option.cpp

@@ -1,13 +1,11 @@
 // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \
-// RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [ \
-// RUN: ]}'
+// RUN: cppcoreguidelines-narrowing-conversions %t --
 
 // RUN: %check_clang_tidy -check-suffix=WARN %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [ \
-// RUN:   {key: cppcoreguidelines-narrowing-conversions.WarnWithinTemplateInstantiation, value: 1} \
-// RUN: ]}'
+// RUN: -config='{CheckOptions: { \
+// RUN:   cppcoreguidelines-narrowing-conversions.WarnWithinTemplateInstantiation: 1 \
+// RUN: }}'
 
 template <typename OrigType>
 void assign_in_template(OrigType jj) {

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowinginteger-option.cpp

@@ -1,10 +1,10 @@
 // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion, value: true}]}'
+// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion: true}}'
 
 // RUN: %check_clang_tidy -check-suffix=DISABLED %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion, value: false}]}'
+// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerNarrowingConversion: false}}'
 
 void foo(unsigned long long value) {
   int a = value;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-narrowingintegertofloatingpoint-option.cpp

@@ -1,10 +1,10 @@
 // RUN: %check_clang_tidy -check-suffix=DEFAULT %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion, value: true}]}'
+// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion: true}}'
 
 // RUN: %check_clang_tidy -check-suffix=DISABLED %s \
 // RUN: cppcoreguidelines-narrowing-conversions %t -- \
-// RUN: -config='{CheckOptions: [{key: cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion, value: false}]}'
+// RUN: -config='{CheckOptions: {cppcoreguidelines-narrowing-conversions.WarnOnIntegerToFloatingPointNarrowingConversion: false}}'
 
 void foo(unsigned long long value) {
   double a = value;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions-pedanticmode-option.cpp

@@ -1,7 +1,6 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-narrowing-conversions %t \
-// RUN: -config="{CheckOptions: [ \
-// RUN:   {key: "cppcoreguidelines-narrowing-conversions.PedanticMode", value: true} \
-// RUN: ]}" \
+// RUN: -config="{CheckOptions: { \
+// RUN:   cppcoreguidelines-narrowing-conversions.PedanticMode: true}}" \
 // RUN: -- -target x86_64-unknown-linux -fsigned-char
 
 namespace floats {

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/narrowing-conversions.cpp

@@ -1,7 +1,6 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-narrowing-conversions %t \
-// RUN: -config="{CheckOptions: [ \
-// RUN:   {key: "cppcoreguidelines-narrowing-conversions.WarnOnFloatingPointNarrowingConversion", value: false}, \
-// RUN: ]}" \
+// RUN: -config="{CheckOptions: { \
+// RUN:   cppcoreguidelines-narrowing-conversions.WarnOnFloatingPointNarrowingConversion: false}}" \
 // RUN: -- -target x86_64-unknown-linux -fsigned-char
 
 float ceil(float);

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-custom.cpp

@@ -1,8 +1,8 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-no-malloc %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: cppcoreguidelines-no-malloc.Allocations, value: "::malloc;::align_malloc;::calloc"},\
-// RUN:   {key: cppcoreguidelines-no-malloc.Reallocations, value: "::realloc;::align_realloc"},\
-// RUN:   {key: cppcoreguidelines-no-malloc.Deallocations, value: "::free;::align_free"}]}' \
+// RUN:  {cppcoreguidelines-no-malloc.Allocations: "::malloc;::align_malloc;::calloc",\
+// RUN:   cppcoreguidelines-no-malloc.Reallocations: "::realloc;::align_realloc",\
+// RUN:   cppcoreguidelines-no-malloc.Deallocations: "::free;::align_free"}}' \
 // RUN: --
 
 using size_t = __SIZE_TYPE__;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/no-malloc-no-functions.cpp

@@ -1,8 +1,8 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-no-malloc %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: cppcoreguidelines-no-malloc.Allocations, value: "::malloc"},\
-// RUN:   {key: cppcoreguidelines-no-malloc.Reallocations, value: ""},\
-// RUN:   {key: cppcoreguidelines-no-malloc.Deallocations, value: ""}]}' \
+// RUN:  {cppcoreguidelines-no-malloc.Allocations: "::malloc",\
+// RUN:   cppcoreguidelines-no-malloc.Reallocations: "",\
+// RUN:   cppcoreguidelines-no-malloc.Deallocations: ""}}' \
 // RUN: --
 
 // Just ensure, the check will not crash, when no functions shall be checked.

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/owning-memory-legacy-functions.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-owning-memory %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: cppcoreguidelines-owning-memory.LegacyResourceProducers, value: "::malloc;::aligned_alloc;::realloc;::calloc;::fopen;::freopen;::tmpfile"}, \
-// RUN:   {key: cppcoreguidelines-owning-memory.LegacyResourceConsumers, value: "::free;::realloc;::freopen;::fclose"}]}' \
+// RUN:  {cppcoreguidelines-owning-memory.LegacyResourceProducers: "::malloc;::aligned_alloc;::realloc;::calloc;::fopen;::freopen;::tmpfile", \
+// RUN:   cppcoreguidelines-owning-memory.LegacyResourceConsumers: "::free;::realloc;::freopen;::fclose"}}' \
 // RUN: -- -nostdlib -nostdinc++
 
 namespace gsl {

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/prefer-member-initializer-modernize-use-default-member-init-assignment.cpp

@@ -1,8 +1,7 @@
 // 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: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: true}}"
 // 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: false}, \
-// RUN:                          {key: cppcoreguidelines-prefer-member-initializer.UseAssignment, value: true}]}"
+// RUN: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: false, cppcoreguidelines-prefer-member-initializer.UseAssignment: true}}"
 
 class Simple1 {
   int n;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index-gslheader.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s cppcoreguidelines-pro-bounds-constant-array-index %t -- \
-// RUN:     -config='{CheckOptions: [{key: cppcoreguidelines-pro-bounds-constant-array-index.GslHeader, value: "dir1/gslheader.h"}]}'
+// RUN:     -config='{CheckOptions: {cppcoreguidelines-pro-bounds-constant-array-index.GslHeader: "dir1/gslheader.h"}}'
 // CHECK-FIXES: #include "dir1/gslheader.h"
 
 typedef __SIZE_TYPE__ size_t;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init-use-assignment.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s cppcoreguidelines-pro-type-member-init %t -- -config="{CheckOptions: [{key: "cppcoreguidelines-pro-type-member-init.UseAssignment", value: true}]}" -- -fsigned-char
+// RUN: %check_clang_tidy %s cppcoreguidelines-pro-type-member-init %t -- -config="{CheckOptions: {cppcoreguidelines-pro-type-member-init.UseAssignment: true}}" -- -fsigned-char
 
 struct T {
   int i;

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-type-member-init.ignorearrays.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s \
 // RUN: cppcoreguidelines-pro-type-member-init %t \
 // RUN: -config="{CheckOptions: \
-// RUN: [{key: cppcoreguidelines-pro-type-member-init.IgnoreArrays, value: true} ]}"
+// RUN: {cppcoreguidelines-pro-type-member-init.IgnoreArrays: true}}"
 
 typedef int TypedefArray[4];
 using UsingArray = int[4];

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-allow-missing-move-when-copy-is-deleted.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: [{key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctionsWhenCopyIsDeleted, value: true}]}" --
+// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: {cppcoreguidelines-special-member-functions.AllowMissingMoveFunctionsWhenCopyIsDeleted: true}}" --
 
 class DefinesEverything {
   DefinesEverything(const DefinesEverything &);

clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/special-member-functions-relaxed.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: [{key: cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions, value: true}, {key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor, value: true}]}" --
+// RUN: %check_clang_tidy %s cppcoreguidelines-special-member-functions %t -- -config="{CheckOptions: {cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions: true, cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor: true}}" --
 
 // Don't warn on destructors without definitions, they might be defaulted in another TU.
 class DeclaresDestructor {

clang-tools-extra/test/clang-tidy/checkers/google/runtime-int-std.cpp

@@ -1,9 +1,9 @@
 // RUN: %check_clang_tidy %s google-runtime-int %t -- \
-// RUN:   -config='{CheckOptions: [ \
-// RUN:     {key: google-runtime-int.UnsignedTypePrefix, value: "std::uint"}, \
-// RUN:     {key: google-runtime-int.SignedTypePrefix, value: "std::int"}, \
-// RUN:     {key: google-runtime-int.TypeSuffix, value: "_t"}, \
-// RUN:   ]}'
+// RUN:   -config='{CheckOptions: { \
+// RUN:     google-runtime-int.UnsignedTypePrefix: "std::uint", \
+// RUN:     google-runtime-int.SignedTypePrefix: "std::int", \
+// RUN:     google-runtime-int.TypeSuffix: "_t", \
+// RUN:   }}'
 
 long a();
 // CHECK-MESSAGES: [[@LINE-1]]:1: warning: consider replacing 'long' with 'std::int{{..}}_t'

clang-tools-extra/test/clang-tidy/checkers/hicpp/multiway-paths-covered-else.cpp

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy %s hicpp-multiway-paths-covered %t \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: hicpp-multiway-paths-covered.WarnOnMissingElse, value: true}]}'\
+// RUN:  {hicpp-multiway-paths-covered.WarnOnMissingElse: true}}'\
 // RUN: --
 
 enum OS { Mac,

clang-tools-extra/test/clang-tidy/checkers/hicpp/signed-bitwise-integer-literals.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s hicpp-signed-bitwise %t -- \
-// RUN:   -config="{CheckOptions: [{key: hicpp-signed-bitwise.IgnorePositiveIntegerLiterals, value: true }]}" \
+// RUN:   -config="{CheckOptions: {hicpp-signed-bitwise.IgnorePositiveIntegerLiterals: true}}" \
 // RUN: -- -std=c++11
 
 void examples() {

clang-tools-extra/test/clang-tidy/checkers/misc/non-private-member-variables-in-classes.cpp

@@ -1,9 +1,9 @@
 // RUN: %check_clang_tidy -check-suffixes=PUBLIC,NONPRIVATE,PROTECTED %s misc-non-private-member-variables-in-classes %t
-// RUN: %check_clang_tidy -check-suffixes=PUBLIC,NONPRIVATE,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: false}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: false}]}' --
-// RUN: %check_clang_tidy -check-suffixes=PUBLIC,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: false}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: true}]}' --
+// RUN: %check_clang_tidy -check-suffixes=PUBLIC,NONPRIVATE,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: false, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: false}}' --
+// RUN: %check_clang_tidy -check-suffixes=PUBLIC,PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: false, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: true}}' --
 // RUN: %check_clang_tidy -check-suffixes=PUBLIC,PROTECTED %s cppcoreguidelines-non-private-member-variables-in-classes %t -- --
-// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: true}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: false}]}' --
-// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: [{key: misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables, value: true}, {key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic, value: true}]}' --
+// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: true, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: false}}' --
+// RUN: %check_clang_tidy -check-suffixes=PROTECTED %s misc-non-private-member-variables-in-classes %t -- -config='{CheckOptions: {misc-non-private-member-variables-in-classes.IgnorePublicMemberVariables: true, misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic: true}}' --
 
 //----------------------------------------------------------------------------//
 

clang-tools-extra/test/clang-tidy/checkers/misc/unused-parameters-strict.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s misc-unused-parameters %t -- \
-// RUN:   -config="{CheckOptions: [{key: StrictMode, value: true}]}" --
+// RUN:   -config="{CheckOptions: {StrictMode: true}}" --
 
 // Warn on empty function bodies in StrictMode.
 namespace strict_mode {

clang-tools-extra/test/clang-tidy/checkers/modernize/avoid-bind-permissive-parameter-list.cpp

@@ -1,6 +1,6 @@
 // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-avoid-bind %t -- \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:     {key: modernize-avoid-bind.PermissiveParameterList, value: true}]}" --
+// RUN:   -config="{CheckOptions: { \
+// RUN:     modernize-avoid-bind.PermissiveParameterList: true}}" --
 
 namespace std {
 inline namespace impl {

clang-tools-extra/test/clang-tidy/checkers/modernize/deprecated-headers-extern-c.cpp

@@ -14,7 +14,7 @@
 
 // RUN: %check_clang_tidy -std=c++11 %s modernize-deprecated-headers %t \
 // RUN:   -check-suffixes=DEFAULT,CHECK-HEADER-FILE \
-// RUN:   -config="{CheckOptions: [{key: modernize-deprecated-headers.CheckHeaderFile, value: 'true'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-deprecated-headers.CheckHeaderFile: 'true'}}" \
 // RUN:   --header-filter='.*' --system-headers \
 // RUN:   -- -I %t/usr -isystem %t/sys -isystem %S/Inputs/deprecated-headers
 

clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-camelback.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'camelBack'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-loop-convert.NamingStyle: 'camelBack'}}" \
 // RUN:   -- -I %S/Inputs/loop-convert
 
 #include "structures.h"

clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-lowercase.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'lower_case'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-loop-convert.NamingStyle: 'lower_case'}}" \
 // RUN:   -- -I %S/Inputs/loop-convert
 
 #include "structures.h"

clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-reverse.cpp

@@ -1,31 +1,31 @@
 // RUN: %check_clang_tidy -std=c++20 -check-suffixes=,RANGES %s modernize-loop-convert %t
 
 // RUN: %check_clang_tidy -check-suffixes=,CUSTOM,CUSTOM-NO-SYS %s modernize-loop-convert %t -- \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:   {key: modernize-loop-convert.MakeReverseRangeFunction, value: 'llvm::reverse'}, \
-// RUN:   {key: modernize-loop-convert.MakeReverseRangeHeader, value: 'llvm/ADT/STLExtras.h'}]}"
+// RUN:   -config="{CheckOptions: { \
+// RUN:   modernize-loop-convert.MakeReverseRangeFunction: 'llvm::reverse', \
+// RUN:   modernize-loop-convert.MakeReverseRangeHeader: 'llvm/ADT/STLExtras.h'}}"
 
 // RUN: %check_clang_tidy -check-suffixes=,CUSTOM,CUSTOM-SYS %s modernize-loop-convert %t -- \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:   {key: modernize-loop-convert.MakeReverseRangeFunction, value: 'llvm::reverse'}, \
-// RUN:   {key: modernize-loop-convert.MakeReverseRangeHeader, value: '<llvm/ADT/STLExtras.h>'}]}"
+// RUN:   -config="{CheckOptions: { \
+// RUN:   modernize-loop-convert.MakeReverseRangeFunction: 'llvm::reverse', \
+// RUN:   modernize-loop-convert.MakeReverseRangeHeader: '<llvm/ADT/STLExtras.h>'}}"
 
 // RUN: %check_clang_tidy -check-suffixes=,CUSTOM,CUSTOM-NO-HEADER %s modernize-loop-convert %t -- \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:   {key: modernize-loop-convert.MakeReverseRangeFunction, value: 'llvm::reverse'}]}"
+// RUN:   -config="{CheckOptions: { \
+// RUN:   modernize-loop-convert.MakeReverseRangeFunction: 'llvm::reverse'}}"
 
 // Ensure the check doesn't transform reverse loops when not in c++20 mode or
 // when UseCxx20ReverseRanges has been disabled
 // RUN: clang-tidy %s -checks=-*,modernize-loop-convert -- -std=c++17 | count 0
 
 // RUN: clang-tidy %s -checks=-*,modernize-loop-convert -config="{CheckOptions: \
-// RUN:     [{key: modernize-loop-convert.UseCxx20ReverseRanges, value: 'false'}] \
+// RUN:     {modernize-loop-convert.UseCxx20ReverseRanges: 'false'} \
 // RUN:     }" -- -std=c++20 | count 0
 
 // Ensure we get a warning if we supply the header argument without the
 // function argument.
-// RUN: clang-tidy %s -checks=-*,modernize-loop-convert -config="{CheckOptions: [ \
-// RUN:   {key: modernize-loop-convert.MakeReverseRangeHeader, value: 'llvm/ADT/STLExtras.h'}]}" \
+// RUN: clang-tidy %s -checks=-*,modernize-loop-convert -config="{CheckOptions: { \
+// RUN:   modernize-loop-convert.MakeReverseRangeHeader: 'llvm/ADT/STLExtras.h'}}" \
 // RUN: -- -std=c++17 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK-HEADER-NO-FUNC \
 // RUN:       -implicit-check-not="{{warning|error}}:"

clang-tools-extra/test/clang-tidy/checkers/modernize/loop-convert-uppercase.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-loop-convert %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-loop-convert.NamingStyle, value: 'UPPER_CASE'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-loop-convert.NamingStyle: 'UPPER_CASE'}}" \
 // RUN:   -- -I %S/Inputs/loop-convert
 
 #include "structures.h"

clang-tools-extra/test/clang-tidy/checkers/modernize/make-shared-header.cpp

@@ -1,10 +1,8 @@
 // RUN: %check_clang_tidy %s modernize-make-shared %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:     [{key: modernize-make-shared.MakeSmartPtrFunction, \
-// RUN:       value: 'my::MakeShared'}, \
-// RUN:      {key: modernize-make-shared.MakeSmartPtrFunctionHeader, \
-// RUN:       value: 'make_shared_util.h'} \
-// RUN:     ]}" \
+// RUN:     {modernize-make-shared.MakeSmartPtrFunction: 'my::MakeShared', \
+// RUN:      modernize-make-shared.MakeSmartPtrFunctionHeader: 'make_shared_util.h' \
+// RUN:     }}" \
 // RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "shared_ptr.h"

clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-default-init.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: modernize-make-unique.IgnoreDefaultInitialization, \
-// RUN:               value: 'false'}] \
+// RUN:             {modernize-make-unique.IgnoreDefaultInitialization: \
+// RUN:              'false'}} \
 // RUN:             }" \
 // RUN:   -- -I %S/Inputs/smart-ptr
 

clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-header.cpp

@@ -1,10 +1,8 @@
 // RUN: %check_clang_tidy %s modernize-make-unique %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:     [{key: modernize-make-unique.MakeSmartPtrFunction, \
-// RUN:       value: 'my::MakeUnique'}, \
-// RUN:      {key: modernize-make-unique.MakeSmartPtrFunctionHeader, \
-// RUN:       value: 'make_unique_util.h'} \
-// RUN:     ]}" \
+// RUN:     {modernize-make-unique.MakeSmartPtrFunction: 'my::MakeUnique', \
+// RUN:      modernize-make-unique.MakeSmartPtrFunctionHeader: 'make_unique_util.h' \
+// RUN:     }}" \
 // RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "unique_ptr.h"

clang-tools-extra/test/clang-tidy/checkers/modernize/make-unique-macros.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy -std=c++14-or-later %s modernize-make-unique %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-make-unique.IgnoreMacros, value: false}]}" \
+// RUN:   -config="{CheckOptions: {modernize-make-unique.IgnoreMacros: false}}" \
 // RUN:   -- -I %S/Inputs/smart-ptr
 
 #include "unique_ptr.h"

clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal-delimiter.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config='{CheckOptions: [{key: "modernize-raw-string-literal.DelimiterStem", value: "str"}, {key: modernize-raw-string-literal.ReplaceShorterLiterals, value: true}]}'
+// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config='{CheckOptions: {modernize-raw-string-literal.DelimiterStem: "str", modernize-raw-string-literal.ReplaceShorterLiterals: true}}'
 
 char const *const ContainsSentinel{"who\\ops)\""};
 // CHECK-MESSAGES: :[[@LINE-1]]:36: warning: {{.*}} can be written as a raw string literal

clang-tools-extra/test/clang-tidy/checkers/modernize/raw-string-literal.cpp

@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config="{CheckOptions: [{key: modernize-raw-string-literal.ReplaceShorterLiterals, value: true}]}"
+// RUN: %check_clang_tidy %s modernize-raw-string-literal %t -- -config="{CheckOptions: {modernize-raw-string-literal.ReplaceShorterLiterals: true}}"
 
 char const *const BackSlash("goink\\frob");
 // CHECK-MESSAGES: :[[@LINE-1]]:29: warning: escaped string literal can be written as a raw string literal [modernize-raw-string-literal]

clang-tools-extra/test/clang-tidy/checkers/modernize/replace-disallow-copy-and-assign-macro.cpp

@@ -3,25 +3,25 @@
 
 // RUN: %check_clang_tidy -format-style=LLVM -check-suffix=DIFFERENT-NAME %s \
 // RUN:  modernize-replace-disallow-copy-and-assign-macro %t \
-// RUN:  -config="{CheckOptions: [ \
-// RUN:   {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \
-// RUN:    value: MY_MACRO_NAME}]}"
+// RUN:  -config="{CheckOptions: { \
+// RUN:   modernize-replace-disallow-copy-and-assign-macro.MacroName: \
+// RUN:     MY_MACRO_NAME}}"
 
 // RUN: %check_clang_tidy -format-style=LLVM -check-suffix=FINALIZE %s \
 // RUN:  modernize-replace-disallow-copy-and-assign-macro %t \
-// RUN:  -config="{CheckOptions: [ \
-// RUN:   {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \
-// RUN:    value: DISALLOW_COPY_AND_ASSIGN_FINALIZE}]}"
+// RUN:  -config="{CheckOptions: { \
+// RUN:   modernize-replace-disallow-copy-and-assign-macro.MacroName: \
+// RUN:     DISALLOW_COPY_AND_ASSIGN_FINALIZE}}"
 
 // RUN: clang-tidy %s -checks="-*,modernize-replace-disallow-copy-and-assign-macro" \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:    {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \
-// RUN:     value: DISALLOW_COPY_AND_ASSIGN_MORE_AGUMENTS}]}" -- -Wno-extra-semi | count 0
+// RUN:  -config="{CheckOptions: { \
+// RUN:    modernize-replace-disallow-copy-and-assign-macro.MacroName: \
+// RUN:      DISALLOW_COPY_AND_ASSIGN_MORE_AGUMENTS}}" -- -Wno-extra-semi | count 0
 
 // RUN: clang-tidy %s -checks="-*,modernize-replace-disallow-copy-and-assign-macro" \
-// RUN:   -config="{CheckOptions: [ \
-// RUN:    {key: modernize-replace-disallow-copy-and-assign-macro.MacroName, \
-// RUN:     value: DISALLOW_COPY_AND_ASSIGN_NEEDS_PREEXPANSION}]}" -- -Wno-extra-semi | count 0
+// RUN:  -config="{CheckOptions: { \
+// RUN:    modernize-replace-disallow-copy-and-assign-macro.MacroName: \
+// RUN:      DISALLOW_COPY_AND_ASSIGN_NEEDS_PREEXPANSION}}" -- -Wno-extra-semi | count 0
 
 // Note: the last two tests expect no diagnostics, but FileCheck cannot handle
 // that, hence the use of | count 0.

clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast-remove-stars.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-auto %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 'true'} , {key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-use-auto.RemoveStars: 'true' , modernize-use-auto.MinTypeNameLength: '0'}}" \
 // RUN:   -- -frtti
 
 struct A {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-cast.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-auto %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-use-auto.MinTypeNameLength: '0'}}" \
 // RUN:   -- -I %S/Inputs/use-auto -frtti
 
 struct A {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-min-type-name-length.cpp

@@ -1,7 +1,7 @@
-// RUN: %check_clang_tidy -check-suffix=0-0 %s modernize-use-auto %t  -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: false}, {key: modernize-use-auto.MinTypeNameLength, value: 0}]}" -- -frtti
-// RUN: %check_clang_tidy -check-suffix=0-8 %s modernize-use-auto %t  -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: false}, {key: modernize-use-auto.MinTypeNameLength, value: 8}]}" -- -frtti
-// RUN: %check_clang_tidy -check-suffix=1-0 %s modernize-use-auto %t  -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: true}, {key: modernize-use-auto.MinTypeNameLength, value: 0}]}" -- -frtti
-// RUN: %check_clang_tidy -check-suffix=1-8 %s modernize-use-auto %t  -- -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: true}, {key: modernize-use-auto.MinTypeNameLength, value: 8}]}" -- -frtti
+// RUN: %check_clang_tidy -check-suffix=0-0 %s modernize-use-auto %t  -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: false, modernize-use-auto.MinTypeNameLength: 0}}" -- -frtti
+// RUN: %check_clang_tidy -check-suffix=0-8 %s modernize-use-auto %t  -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: false, modernize-use-auto.MinTypeNameLength: 8}}" -- -frtti
+// RUN: %check_clang_tidy -check-suffix=1-0 %s modernize-use-auto %t  -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: true, modernize-use-auto.MinTypeNameLength: 0}}" -- -frtti
+// RUN: %check_clang_tidy -check-suffix=1-8 %s modernize-use-auto %t  -- -config="{CheckOptions: {modernize-use-auto.RemoveStars: true, modernize-use-auto.MinTypeNameLength: 8}}" -- -frtti
 
 template <class T> extern T foo();
 template <class T> struct P {  explicit P(T t) : t_(t) {}  T t_;};

clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new-remove-stars.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-auto %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-auto.RemoveStars, value: 'true'}, {key: modernize-use-auto.MinTypeNameLength, value: '0'}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-auto.RemoveStars: 'true', modernize-use-auto.MinTypeNameLength: '0'}}"
 
 class MyType {};
 

clang-tools-extra/test/clang-tidy/checkers/modernize/use-auto-new.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-auto %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-auto.MinTypeNameLength, value: '0'}]}" \
+// RUN:   -config="{CheckOptions: {modernize-use-auto.MinTypeNameLength: '0'}}" \
 // RUN:   -- -frtti
 
 class MyType {};

clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals-ignore-macros.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s modernize-use-bool-literals %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: modernize-use-bool-literals.IgnoreMacros, \
-// RUN:               value: true}]}"
+// RUN:             {modernize-use-bool-literals.IgnoreMacros: \
+// RUN:                true}}"
 
 bool IntToTrue = 1;
 // CHECK-MESSAGES: :[[@LINE-1]]:18: warning: converting integer literal to bool, use bool literal instead [modernize-use-bool-literals]

clang-tools-extra/test/clang-tidy/checkers/modernize/use-bool-literals.cpp

@@ -1,7 +1,7 @@
 // RUN: %check_clang_tidy %s modernize-use-bool-literals %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: modernize-use-bool-literals.IgnoreMacros, \
-// RUN:               value: false}]}"
+// RUN:             {modernize-use-bool-literals.IgnoreMacros: \
+// RUN:                false}}"
 
 bool IntToTrue = 1;
 // CHECK-MESSAGES: :[[@LINE-1]]:18: warning: converting integer literal to bool, use bool literal instead [modernize-use-bool-literals]

clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-assignment.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-default-member-init %t -- \
-// RUN: -config="{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: true}]}"
+// RUN: -config="{CheckOptions: {modernize-use-default-member-init.UseAssignment: true}}"
 
 struct S {
 };

clang-tools-extra/test/clang-tidy/checkers/modernize/use-default-member-init-macros.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-default-member-init %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-default-member-init.IgnoreMacros, value: false}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-default-member-init.IgnoreMacros: false}}"
 
 #define MACRO() \
   struct S { \

clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace-ignore-implicit-constructors.cpp

@@ -1,8 +1,7 @@
 // RUN: %check_clang_tidy %s modernize-use-emplace %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: modernize-use-emplace.IgnoreImplicitConstructors, \
-// RUN:               value: true}] \
-// RUN:             }"
+// RUN:             {modernize-use-emplace.IgnoreImplicitConstructors: \
+// RUN:                true}}"
 
 namespace std {
 template <typename>

clang-tools-extra/test/clang-tidy/checkers/modernize/use-emplace.cpp

@@ -1,12 +1,11 @@
 // RUN: %check_clang_tidy %s modernize-use-emplace %t -- \
 // RUN:   -config="{CheckOptions: \
-// RUN:             [{key: modernize-use-emplace.ContainersWithPushBack, \
-// RUN:               value: '::std::vector; ::std::list; ::std::deque; llvm::LikeASmallVector'}, \
-// RUN:              {key: modernize-use-emplace.TupleTypes, \
-// RUN:               value: '::std::pair; std::tuple; ::test::Single'}, \
-// RUN:              {key: modernize-use-emplace.TupleMakeFunctions, \
-// RUN:               value: '::std::make_pair; ::std::make_tuple; ::test::MakeSingle'}] \
-// RUN:             }"
+// RUN:             {modernize-use-emplace.ContainersWithPushBack: \
+// RUN:                '::std::vector; ::std::list; ::std::deque; llvm::LikeASmallVector', \
+// RUN:              modernize-use-emplace.TupleTypes: \
+// RUN:                '::std::pair; std::tuple; ::test::Single', \
+// RUN:              modernize-use-emplace.TupleMakeFunctions: \
+// RUN:                '::std::make_pair; ::std::make_tuple; ::test::MakeSingle'}}"
 
 namespace std {
 template <typename>

clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-copy.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-equals-default %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-equals-default.IgnoreMacros, value: false}]}" \
+// RUN:   -config="{CheckOptions: {modernize-use-equals-default.IgnoreMacros: false}}" \
 // RUN:   -- -fno-delayed-template-parsing -fexceptions
 
 // Out of line definition.

clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-default-macros.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-equals-default %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-equals-default.IgnoreMacros, value: false}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-equals-default.IgnoreMacros: false}}"
 
 #define STRUCT_WITH_DEFAULT(_base, _type) \
   struct _type {                          \

clang-tools-extra/test/clang-tidy/checkers/modernize/use-equals-delete-macros.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-equals-delete %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-equals-delete.IgnoreMacros, value: false}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-equals-delete.IgnoreMacros: false}}"
 
 #define MACRO(type) void operator=(type const &)
 class C {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-clang-unused.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: '[[clang::warn_unused_result]]'}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: '[[clang::warn_unused_result]]'}}"
 
 class Foo
 {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-cxx11.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: '__attribute__((warn_unused_result))'}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: '__attribute__((warn_unused_result))'}}"
 
 class Foo
 {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-gcc-unused.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: '[[gcc::warn_unused_result]]'}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: '[[gcc::warn_unused_result]]'}}"
 
 class Foo
 {

clang-tools-extra/test/clang-tidy/checkers/modernize/use-nodiscard-no-macro-inscope-cxx11.cpp

@@ -1,5 +1,5 @@
 // RUN: %check_clang_tidy %s modernize-use-nodiscard %t -- \
-// RUN:   -config="{CheckOptions: [{key: modernize-use-nodiscard.ReplacementString, value: 'CUSTOM_NO_DISCARD'}]}"
+// RUN:   -config="{CheckOptions: {modernize-use-nodiscard.ReplacementString: 'CUSTOM_NO_DISCARD'}}"
 
 // As if the macro was not defined.
 // #define CUSTOM_NO_DISCARD __attribute_((warn_unused_result))