diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp index 89bf7f04f5576..6cf59f91016df 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/redundant-void-arg.cpp @@ -306,8 +306,8 @@ void gronk::bar(void) { // CHECK-MESSAGES: :[[@LINE-2]]:11: warning: {{.*}} in variable declaration // CHECK-FIXES: {{^ }}void (gronk::*p5){{$}} // CHECK-FIXES-NEXT: {{^ \($}} - // CHECK-FIXES-NExT: {{^ $}} - // CHECK-FIXES-NExT: {{^ \);$}} + // CHECK-FIXES-NEXT: {{^ $}} + // CHECK-FIXES-NEXT: {{^ \);$}} } // intentionally not LLVM style to check preservation of whitespace diff --git a/clang/test/AST/ast-crash-doc-function-template.cpp b/clang/test/AST/ast-crash-doc-function-template.cpp index a1627c7b4d545..cb36cd30f2d3a 100644 --- a/clang/test/AST/ast-crash-doc-function-template.cpp +++ b/clang/test/AST/ast-crash-doc-function-template.cpp @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: %clang_cc1 -x c++ -Wdocumentation -ast-dump-all %t/t.cpp +// RUN: %clang_cc1 -x c++ -Wdocumentation -ast-dump-all %t/t.cpp | FileCheck %s //--- t.h /// MyClass in the header file diff --git a/clang/test/AST/ast-dump-attr-type.cpp b/clang/test/AST/ast-dump-attr-type.cpp index 78a3b660bbe60..07337aaaf2590 100644 --- a/clang/test/AST/ast-dump-attr-type.cpp +++ b/clang/test/AST/ast-dump-attr-type.cpp @@ -19,6 +19,6 @@ using Ty1 = decltype(y); // CHECK-NEXT: |-DeclRefExpr 0x{{[^ ]*}} '__attribute__((address_space(3))) int *' lvalue Var 0x{{[^ ]*}} 'y' '__attribute__((address_space(3))) int *' non_odr_use_unevaluated // CHECK-NEXT: `-PointerType 0x{{[^ ]*}} '__attribute__((address_space(3))) int *' // CHECK-NEXT: `-AttributedType 0x{{[^ ]*}} '__attribute__((address_space(3))) int' sugar -// CHECK-NEXT |-BuiltinType 0x{{[^ ]*}} 'int' -// CHECK-NEXT `-QualType 0x{{[^ ]*}} '__attribute__((address_space(3))) int' __attribute__((address_space(3))) -// CHECK-NEXT `-BuiltinType 0x{{[^ ]*}} 'int' +// CHECK-NEXT: |-BuiltinType 0x{{[^ ]*}} 'int' +// CHECK-NEXT: `-QualType 0x{{[^ ]*}} '__attribute__((address_space(3))) int' __attribute__((address_space(3))) +// CHECK-NEXT: `-BuiltinType 0x{{[^ ]*}} 'int' diff --git a/clang/test/AST/ast-dump-decl.c b/clang/test/AST/ast-dump-decl.c index 683df50f7e91c..68428968e02b8 100644 --- a/clang/test/AST/ast-dump-decl.c +++ b/clang/test/AST/ast-dump-decl.c @@ -73,7 +73,7 @@ enum TestEnumDeclForward; // CHECK: EnumDecl{{.*}} TestEnumDeclForward __module_private__ enum TestEnumDeclPrivate; -// CHECK-MODULE: EnumDecl{{.*}} TestEnumDeclPrivate __module_private__ +// CHECK-MODULES: EnumDecl{{.*}} TestEnumDeclPrivate __module_private__ struct TestRecordDecl { int i; @@ -103,7 +103,7 @@ struct TestRecordDeclForward; // CHECK: RecordDecl{{.*}} struct TestRecordDeclForward __module_private__ struct TestRecordDeclPrivate; -// CHECK-MODULE: RecordDecl{{.*}} struct TestRecordDeclPrivate __module_private__ +// CHECK-MODULES: RecordDecl{{.*}} struct TestRecordDeclPrivate __module_private__ enum testEnumConstantDecl { TestEnumConstantDecl, @@ -163,7 +163,7 @@ struct testFieldDecl { // CHECK-NEXT: ConstantExpr // CHECK-NEXT: value: Int 1 // CHECK-NEXT: IntegerLiteral -// CHECK-MODULE: FieldDecl{{.*}} TestFieldDeclPrivate 'int' __module_private__ +// CHECK-MODULES: FieldDecl{{.*}} TestFieldDeclPrivate 'int' __module_private__ int TestVarDecl; // CHECK: VarDecl{{.*}} TestVarDecl 'int' @@ -175,7 +175,7 @@ __thread int TestVarDeclThread; // CHECK: VarDecl{{.*}} TestVarDeclThread 'int' tls{{$}} __module_private__ int TestVarDeclPrivate; -// CHECK-MODULE: VarDecl{{.*}} TestVarDeclPrivate 'int' __module_private__ +// CHECK-MODULES: VarDecl{{.*}} TestVarDeclPrivate 'int' __module_private__ int TestVarDeclInit = 0; // CHECK: VarDecl{{.*}} TestVarDeclInit 'int' diff --git a/clang/test/AST/ast-dump-recovery.cpp b/clang/test/AST/ast-dump-recovery.cpp index fa6d747556dd8..17e66b2edc316 100644 --- a/clang/test/AST/ast-dump-recovery.cpp +++ b/clang/test/AST/ast-dump-recovery.cpp @@ -200,7 +200,7 @@ void InvalidInitalizer(int x) { // CHECK: `-VarDecl {{.*}} a3 'Bar' // CHECK-NEXT: `-RecoveryExpr {{.*}} contains-errors // CHECK-NEXT: `-InitListExpr - // CHECK-NEDT: `-DeclRefExpr {{.*}} 'x' + // CHECK-NEXT: `-DeclRefExpr {{.*}} 'x' Bar a3{x}; // CHECK: `-VarDecl {{.*}} a4 'Bar' // CHECK-NEXT: `-ParenListExpr {{.*}} 'NULL TYPE' contains-errors diff --git a/clang/test/AST/ast-dump-using-template.cpp b/clang/test/AST/ast-dump-using-template.cpp index 75db5eb5a9d1c..84c60e7327cd2 100644 --- a/clang/test/AST/ast-dump-using-template.cpp +++ b/clang/test/AST/ast-dump-using-template.cpp @@ -22,7 +22,7 @@ using A = S; // CHECK-NEXT: `-ElaboratedType {{.*}} 'S' sugar dependent // CHECK-NEXT: `-TemplateSpecializationType {{.*}} 'S' dependent // CHECK-NEXT: |-name: 'S':'ns::S' qualified -// CHECk-NEXT: | |-UsingShadowDecl {{.+}} ClassTemplate {{.+}} 'S' +// CHECK-NEXT: | |-UsingShadowDecl {{.+}} ClassTemplate {{.+}} 'S' // TemplateName in TemplateArgument. template