@@ -49,6 +49,8 @@ TEST(AArch32_ELF, readAddendArmErrors) {
49
49
Edge InvalidEdge (Edge::GenericEdgeKind::Invalid, 0 /* Offset*/ , TargetSymbol,
50
50
0 /* Addend*/ );
51
51
52
+ // Edge kind is tested, block itself is not significant here. So it is tested
53
+ // once in Arm
52
54
EXPECT_THAT_EXPECTED (readAddendData (*G, BArm, InvalidEdge),
53
55
FailedWithMessage (testing::HasSubstr (
54
56
" can not read implicit addend for aarch32 edge kind "
@@ -93,21 +95,6 @@ TEST(AArch32_ELF, readAddendThumbErrors) {
93
95
Edge InvalidEdge (Edge::GenericEdgeKind::Invalid, 0 /* Offset*/ , TargetSymbol,
94
96
0 /* Addend*/ );
95
97
96
- EXPECT_THAT_EXPECTED (readAddendData (*G, BThumb, InvalidEdge),
97
- FailedWithMessage (testing::HasSubstr (
98
- " can not read implicit addend for aarch32 edge kind "
99
- " INVALID RELOCATION" )));
100
-
101
- EXPECT_THAT_EXPECTED (readAddendArm (*G, BThumb, InvalidEdge),
102
- FailedWithMessage (testing::HasSubstr (
103
- " can not read implicit addend for aarch32 edge kind "
104
- " INVALID RELOCATION" )));
105
-
106
- EXPECT_THAT_EXPECTED (readAddendThumb (*G, BThumb, InvalidEdge, ArmCfg),
107
- FailedWithMessage (testing::HasSubstr (
108
- " can not read implicit addend for aarch32 edge kind "
109
- " INVALID RELOCATION" )));
110
-
111
98
for (Edge::Kind K = FirstThumbRelocation; K < LastThumbRelocation; K += 1 ) {
112
99
Edge E (K, 0 , TargetSymbol, 0 );
113
100
EXPECT_THAT_EXPECTED (
@@ -132,6 +119,8 @@ TEST(AArch32_ELF, applyFixupArmErrors) {
132
119
Edge InvalidEdge (Edge::GenericEdgeKind::Invalid, 0 /* Offset*/ , TargetSymbol,
133
120
0 /* Addend*/ );
134
121
122
+ // Edge kind is tested, block itself is not significant here. So it is tested
123
+ // once in Arm
135
124
EXPECT_THAT_ERROR (
136
125
applyFixupData (*G, BArm, InvalidEdge),
137
126
FailedWithMessage (testing::HasSubstr (
@@ -181,25 +170,11 @@ TEST(AArch32_ELF, applyFixupThumbErrors) {
181
170
182
171
auto &BThumb = G->createMutableContentBlock (
183
172
Sec, MutableThumbContent, B4DummyAddr, ThumbAlignment, AlignmentOffset);
184
-
185
173
Symbol &TargetSymbol =
186
174
G->addAnonymousSymbol (BThumb, SymbolOffset, SymbolSize, false , false );
187
175
Edge InvalidEdge (Edge::GenericEdgeKind::Invalid, 0 /* Offset*/ , TargetSymbol,
188
176
0 /* Addend*/ );
189
177
190
- EXPECT_THAT_ERROR (
191
- applyFixupData (*G, BThumb, InvalidEdge),
192
- FailedWithMessage (testing::HasSubstr (
193
- " encountered unfixable aarch32 edge kind INVALID RELOCATION" )));
194
- EXPECT_THAT_ERROR (
195
- applyFixupArm (*G, BThumb, InvalidEdge),
196
- FailedWithMessage (testing::HasSubstr (
197
- " encountered unfixable aarch32 edge kind INVALID RELOCATION" )));
198
- EXPECT_THAT_ERROR (
199
- applyFixupThumb (*G, BThumb, InvalidEdge, ArmCfg),
200
- FailedWithMessage (testing::HasSubstr (
201
- " encountered unfixable aarch32 edge kind INVALID RELOCATION" )));
202
-
203
178
for (Edge::Kind K = FirstThumbRelocation; K < LastThumbRelocation; K += 1 ) {
204
179
Edge E (K, 0 , TargetSymbol, 0 );
205
180
EXPECT_THAT_ERROR (applyFixupThumb (*G, BThumb, E, ArmCfg),
0 commit comments