Skip to content

Commit 70981cf

Browse files
committed
tests: fix misspelled check prefixes
Fix the common error of using underscores instead of dashes. In the rebranch this is an error (lit got more picky), but it also makes sense to fix the tests in the main branch
1 parent 02c2ab4 commit 70981cf

29 files changed

+77
-77
lines changed

test/AutoDiff/SILOptimizer/activity_analysis.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-sil -verify -Xllvm -debug-only=differentiation 2>&1 %s | %FileCheck %s
1+
// RUN: %target-swift-emit-sil -verify -Xllvm -debug-only=differentiation %s 2>&1 | %FileCheck %s
22
// REQUIRES: asserts
33

44
import _Differentiation
@@ -456,7 +456,7 @@ func activeInoutArgMutatingMethodVar(_ nonactive: inout Mut, _ x: Mut) {
456456
nonactive = result
457457
}
458458

459-
// CHECK_LABEL: [AD] Activity info for ${{.*}}31activeInoutArgMutatingMethodVaryyAA3MutVz_ADtF at (parameters=(1) results=(0))
459+
// CHECK-LABEL: [AD] Activity info for ${{.*}}31activeInoutArgMutatingMethodVaryyAA3MutVz_ADtF at parameter indices (1) and result indices (0)
460460
// CHECK: [ACTIVE] %0 = argument of bb0 : $*Mut
461461
// CHECK: [ACTIVE] %1 = argument of bb0 : $Mut
462462
// CHECK: [ACTIVE] %4 = alloc_stack $Mut, var, name "result"

test/Concurrency/Runtime/exclusivity.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ struct Runner {
479479
// CHECK-NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): (0x0, 0x0)
480480
// CHECK-NEXT: Access. Pointer: [[ACCESS]]. PC:
481481
// CHECK: Exiting Thread Local Context. After Swizzle. Task: [[TASK]]
482-
// CHECK_NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): ([[LLNODE]], [[LLNODE]])
483-
// CHECK_NEXT: No Accesses.
482+
// CHECK-NEXT: SwiftTaskThreadLocalContext: (FirstAccess,LastAccess): ([[LLNODE]], [[LLNODE]])
483+
// CHECK-NEXT: No Accesses.
484484
//
485485
// CHECK-NOT: Removing access:
486486
// CHECK: ==> End Inner Task Handle

test/Concurrency/async_main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func asyncFunc() async {
4040

4141

4242
// async_Main
43-
// CHECK-SIL_LABEL: sil hidden @async_Main : $@convention(thin) @async () -> () {
43+
// CHECK-SIL-LABEL: sil hidden @async_Main : $@convention(thin) @async () -> () {
4444
// call main
4545
// CHECK-SIL: %0 = metatype $@thin MyProgram.Type // user: %2
4646
// CHECK-SIL-NEXT: // function_ref static MyProgram.$main()

test/DebugInfo/fnptr.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func main() -> Int64 {
3636
baz_fnptr(2.89)
3737

3838
// CHECK-DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZPT:[0-9]+]]
39-
// AST_DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZ_T:[0-9]+]]
39+
// AST-DAG: !DILocalVariable(name: "barz_fnptr",{{.*}} type: ![[BARZ_T:[0-9]+]]
4040
// AST-DAG: ![[BARZ_T:[0-9]+]] = !DICompositeType({{.*}}, identifier: "$sS2fs5Int64VIegyyd_D")
4141
// CHECK-DAG: ![[BARZPT]] = !DICompositeType(tag: DW_TAG_structure_type,{{.*}} elements: ![[BARZMEMBERS:[0-9]+]]
4242
// CHECK-DAG: ![[BARZMEMBERS]] = !{![[BARZMEMBER:.*]], {{.*}}}

test/IDE/complete_func_reference.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ do {
121121
}
122122

123123
// ANY_INT: Begin completions
124-
// ANY_INT_DAG: Decl{{.*}}/TypeRelation[Convertible]: anyToInt(a:); name=anyToInt(a:)
124+
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Convertible]: anyToInt(a:)[#(Any) -> Int#]; name=anyToInt(a:)
125125
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: intToVoid({#a: Int#})[#Void#];
126126
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: anyToVoid({#a: Any#})[#Void#];
127127
// ANY_INT-DAG: Decl{{.*}}/TypeRelation[Invalid]: voidToVoid()[#Void#];

test/IDE/complete_keywords.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// KW_DECL-DAG: Keyword/None: override{{; name=.+$}}
3131
// KW_DECL-DAG: Keyword/None: postfix{{; name=.+$}}
3232
// KW_DECL-DAG: Keyword/None: prefix{{; name=.+$}}
33-
// KW_DECL_DAG: Keyword[precedencegroup]: precedencegroup{{; name=.+$}}
33+
// KW_DECL-DAG: Keyword[precedencegroup]: precedencegroup{{; name=.+$}}
3434
// KW_DECL-DAG: Keyword[private]/None: private{{; name=.+$}}
3535
// KW_DECL-DAG: Keyword[protocol]/None: protocol{{; name=.+$}}
3636
// KW_DECL-DAG: Keyword[public]/None: public{{; name=.+$}}

test/IDE/complete_property_delegate_attribute.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ struct TestStruct {
4747
// FIXME: No call patterns are suggested if we are completing in variable with multiple property wrappers (rdar://91480982)
4848
func sync1() {}
4949

50-
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG_LABEL^#) var test4
51-
// SECOND_ARG_LABEL: Begin completions, 1 items
52-
// SECOND_ARG_LABEL-DAG: Pattern/Local/Flair[ArgLabels]: {#arg2: Int#}[#Int#];
53-
// SECOND_ARG_LABEL: End completions
50+
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG1^#) var test4
51+
// SECOND_ARG1: Begin completions, 1 items
52+
// SECOND_ARG1-DAG: Pattern/Local/Flair[ArgLabels]: {#arg2: Int#}[#Int#];
53+
// SECOND_ARG1: End completions
5454

55-
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG_LABEL_NO_VAR?check=SECOND_ARG_LABEL^#)
55+
@MyStruct(arg1: MyEnum.east, #^SECOND_ARG1_LABEL_NO_VAR?check=SECOND_ARG1^#)
5656

5757
// FIXME: No call patterns are suggested if we are completing in variable with multiple property wrappers (rdar://91480982)
5858
func sync2() {}

test/IDE/conforming-methods-basic.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ func testing(obj: C) {
4040
}
4141

4242
// CHECK_1: -----BEGIN CONFORMING METHOD LIST-----
43-
// CHECK_1_NEXT: - TypeName: C
44-
// CHECK_1_NEXT: - Members:
45-
// CHECK_1_NEXT: - Name: returnsConcreteTarget1()
46-
// CHECK_1_NEXT: TypeName: ConcreteTarget1
47-
// CHECK_1_NEXT: - Name: returnsConcreteTarget1()
48-
// CHECK_1_NEXT: TypeName: ConcreteTarget1
49-
// CHECK_1_NEXT: -----END CONFORMING METHOD LIST-----
43+
// CHECK_1-NEXT: - TypeName: C
44+
// CHECK_1-NEXT: - Members:
45+
// CHECK_1-NEXT: - Name: returnsConcreteTarget1()
46+
// CHECK_1-NEXT: TypeName: ConcreteTarget1
47+
// CHECK_1-NEXT: - Name: returnsConcreteTarget2()
48+
// CHECK_1-NEXT: TypeName: ConcreteTarget2
49+
// CHECK_1-NEXT: -----END CONFORMING METHOD LIST-----

test/IRGen/reflection_metadata.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
// RUN: %target-swift-frontend -disable-reflection-names -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
33
// RUN: %target-swift-frontend -disable-reflection-metadata -emit-ir %s | %FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA
44

5-
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_reflect|.sw5rfst\$B}}
6-
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_fieldmd|.sw5flmd\$B}}
7-
// STRIP_REFLECTION_NAMES_DAG: section "{{[^"]*swift5_assocty|.sw5asty\$B}}
5+
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_assocty|.sw5asty\$B}}
86
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_capture|.sw5cptr\$B}}
97
// STRIP_REFLECTION_NAMES-DAG: section "{{[^"]*swift5_typeref|.sw5tyrf\$B}}
108
// STRIP_REFLECTION_NAMES-DAG: private constant [6 x i8] c"Inner\00", section "{{[^"]*swift5_reflstr|.sw5rfst\$B}}

test/Interop/SwiftToC/structs/large-structs-pass-return-indirect-in-c.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public struct StructSeveralI64 {
1111
// CHECK-NEXT: _Alignas(8) char _storage[40];
1212
// CHECK-NEXT: };
1313

14-
// CHECK_NOT: swift_interop
14+
// CHECK-NOT: swift_interop
1515

1616
public func returnNewStructSeveralI64(i: Int64) -> StructSeveralI64 {
1717
return StructSeveralI64(x1: i, x2: 0, x3: -17, x4: 12345612, x5: -0xFFFF)

0 commit comments

Comments
 (0)