Skip to content

Commit a797d64

Browse files
committed
Merge pull request #2570 from bitjammer/test-reflection-filecheck-26306303
Move test/Reflection tests to FileCheck instead of diff
2 parents 5649bc8 + 7d54ba6 commit a797d64

8 files changed

+982
-981
lines changed

test/Reflection/typeref_decoding.result.txt

Lines changed: 0 additions & 685 deletions
This file was deleted.

test/Reflection/typeref_decoding.swift

Lines changed: 685 additions & 2 deletions
Large diffs are not rendered by default.

test/Reflection/typeref_decoding_imported.swift

Lines changed: 124 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,127 @@
11
// RUN: rm -rf %t && mkdir -p %t
22
// RUN: %target-build-swift %S/Inputs/ImportedTypes.swift -parse-as-library -emit-module -emit-library -module-name TypesToReflect -Xfrontend -enable-reflection-metadata -Xfrontend -enable-reflection-names -o %t/libTypesToReflect.%target-dylib-extension -I %S/Inputs
3-
// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension > %t/result.txt
4-
// RUN: diff -u %s.%target-ptrsize.result.txt %t/result.txt
3+
// RUN: %target-swift-reflection-dump -binary-filename %t/libTypesToReflect.%target-dylib-extension | FileCheck %s --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-cpu
4+
5+
// CHECK-32: FIELDS:
6+
// CHECK-32: =======
7+
// CHECK-32: TypesToReflect.HasCTypes
8+
// CHECK-32: ------------------------
9+
// CHECK-32: mcs: __C.MyCStruct
10+
// CHECK-32: (struct __C.MyCStruct)
11+
12+
// CHECK-32: mce: __C.MyCEnum
13+
// CHECK-32: (struct __C.MyCEnum)
14+
15+
// CHECK-32: mcu: __C.MyCUnion
16+
// CHECK-32: (struct __C.MyCUnion)
17+
18+
// CHECK-32: mcsbf: __C.MyCStructWithBitfields
19+
// CHECK-32: (struct __C.MyCStructWithBitfields)
20+
21+
// CHECK-32: __C.MyCStruct
22+
// CHECK-32: -------------
23+
// CHECK-32: __C.MyCEnum
24+
// CHECK-32: -----------
25+
// CHECK-32: __C.MyCUnion
26+
// CHECK-32: ------------
27+
// CHECK-32: __C.MyCStructWithBitfields
28+
// CHECK-32: --------------------------
29+
30+
// CHECK-32: ASSOCIATED TYPES:
31+
// CHECK-32: =================
32+
33+
// CHECK-32: BUILTIN TYPES:
34+
// CHECK-32: ==============
35+
36+
// CHECK-32: - __C.MyCStruct:
37+
// CHECK-32: Size: 9
38+
// CHECK-32: Alignment: 4
39+
// CHECK-32: Stride: 12
40+
// CHECK-32: NumExtraInhabitants: 0
41+
42+
// CHECK-32: - __C.MyCEnum:
43+
// CHECK-32: Size: 4
44+
// CHECK-32: Alignment: 4
45+
// CHECK-32: Stride: 4
46+
// CHECK-32: NumExtraInhabitants: 0
47+
48+
// CHECK-32: - __C.MyCUnion:
49+
// CHECK-32: Size: 4
50+
// CHECK-32: Alignment: 4
51+
// CHECK-32: Stride: 4
52+
// CHECK-32: NumExtraInhabitants: 0
53+
54+
// CHECK-i386: - __C.MyCStructWithBitfields:
55+
// CHECK-i386: Size: 2
56+
// CHECK-i386: Alignment: 4
57+
// CHECK-i386: Stride: 4
58+
// CHECK-i386: NumExtraInhabitants: 0
59+
60+
// CHECK-arm: - __C.MyCStructWithBitfields:
61+
// CHECK-arm: Size: 2
62+
// CHECK-arm: Alignment: 1
63+
// CHECK-arm: Stride: 2
64+
// CHECK-arm: NumExtraInhabitants: 0
65+
66+
// CHECK-32: CAPTURE DESCRIPTORS:
67+
// CHECK-32: ====================
68+
69+
70+
// CHECK-64: FIELDS:
71+
// CHECK-64: =======
72+
// CHECK-64: TypesToReflect.HasCTypes
73+
// CHECK-64: ------------------------
74+
// CHECK-64: mcs: __C.MyCStruct
75+
// CHECK-64: (struct __C.MyCStruct)
76+
77+
// CHECK-64: mce: __C.MyCEnum
78+
// CHECK-64: (struct __C.MyCEnum)
79+
80+
// CHECK-64: mcu: __C.MyCUnion
81+
// CHECK-64: (struct __C.MyCUnion)
82+
83+
// CHECK-64: mcsbf: __C.MyCStructWithBitfields
84+
// CHECK-64: (struct __C.MyCStructWithBitfields)
85+
86+
// CHECK-64: __C.MyCStruct
87+
// CHECK-64: -------------
88+
// CHECK-64: __C.MyCEnum
89+
// CHECK-64: -----------
90+
// CHECK-64: __C.MyCUnion
91+
// CHECK-64: ------------
92+
// CHECK-64: __C.MyCStructWithBitfields
93+
// CHECK-64: --------------------------
94+
95+
// CHECK-64: ASSOCIATED TYPES:
96+
// CHECK-64: =================
97+
98+
// CHECK-64: BUILTIN TYPES:
99+
// CHECK-64: ==============
100+
101+
// CHECK-64: - __C.MyCStruct:
102+
// CHECK-64: Size: 17
103+
// CHECK-64: Alignment: 8
104+
// CHECK-64: Stride: 24
105+
// CHECK-64: NumExtraInhabitants: 0
106+
107+
// CHECK-64: - __C.MyCEnum:
108+
// CHECK-64: Size: 4
109+
// CHECK-64: Alignment: 4
110+
// CHECK-64: Stride: 4
111+
// CHECK-64: NumExtraInhabitants: 0
112+
113+
// CHECK-64: - __C.MyCUnion:
114+
// CHECK-64: Size: 8
115+
// CHECK-64: Alignment: 8
116+
// CHECK-64: Stride: 8
117+
// CHECK-64: NumExtraInhabitants: 0
118+
119+
// CHECK-64: - __C.MyCStructWithBitfields:
120+
// CHECK-64: Size: 2
121+
// CHECK-64: Alignment: 4
122+
// CHECK-64: Stride: 4
123+
// CHECK-64: NumExtraInhabitants: 0
124+
125+
// CHECK-64: CAPTURE DESCRIPTORS:
126+
// CHECK-64: ====================
5127

6-
// rdar://problem/26306303
7-
// REQUIRES: CPU=x86_64

test/Reflection/typeref_decoding_imported.swift.32.result.txt

Lines changed: 0 additions & 58 deletions
This file was deleted.

test/Reflection/typeref_decoding_imported.swift.64.result.txt

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)