@@ -20,7 +20,7 @@ using namespace llvm::support::endian;
20
20
constexpr unsigned PointerSize = 4 ;
21
21
auto G = std::make_unique<LinkGraph>(" foo" , Triple(" armv7-linux-gnueabi" ),
22
22
PointerSize, endianness::little,
23
- getGenericEdgeKindName );
23
+ aarch32::getEdgeKindName );
24
24
auto &Sec =
25
25
G->createSection (" __data" , orc::MemProt::Read | orc::MemProt::Write);
26
26
@@ -52,9 +52,10 @@ TEST(AArch32_ELF, readAddendArmErrors) {
52
52
" INVALID RELOCATION" )));
53
53
54
54
for (Edge::Kind K = FirstArmRelocation; K < LastArmRelocation; K += 1 ) {
55
- EXPECT_THAT_EXPECTED (
56
- readAddend (*G, BArm, SymbolOffset, K, ArmCfg),
57
- FailedWithMessage (testing::StartsWith (" Invalid opcode" )));
55
+ EXPECT_THAT_EXPECTED (readAddend (*G, BArm, SymbolOffset, K, ArmCfg),
56
+ FailedWithMessage (testing::AllOf (
57
+ testing::StartsWith (" Invalid opcode" ),
58
+ testing::EndsWith (aarch32::getEdgeKindName (K)))));
58
59
}
59
60
}
60
61
@@ -76,9 +77,10 @@ TEST(AArch32_ELF, readAddendThumbErrors) {
76
77
ThumbAlignment, AlignmentOffset);
77
78
78
79
for (Edge::Kind K = FirstThumbRelocation; K < LastThumbRelocation; K += 1 ) {
79
- EXPECT_THAT_EXPECTED (
80
- readAddend (*G, BThumb, SymbolOffset, K, ArmCfg),
81
- FailedWithMessage (testing::StartsWith (" Invalid opcode" )));
80
+ EXPECT_THAT_EXPECTED (readAddend (*G, BThumb, SymbolOffset, K, ArmCfg),
81
+ FailedWithMessage (testing::AllOf (
82
+ testing::StartsWith (" Invalid opcode" ),
83
+ testing::EndsWith (aarch32::getEdgeKindName (K)))));
82
84
}
83
85
}
84
86
@@ -108,7 +110,7 @@ TEST(AArch32_ELF, applyFixupArmErrors) {
108
110
EXPECT_THAT_ERROR (applyFixup (*G, BArm, E, ArmCfg),
109
111
FailedWithMessage (testing::AllOf (
110
112
testing::StartsWith (" Invalid opcode" ),
111
- testing::EndsWith (G-> getEdgeKindName (K)))));
113
+ testing::EndsWith (aarch32:: getEdgeKindName (K)))));
112
114
}
113
115
}
114
116
@@ -149,6 +151,6 @@ TEST(AArch32_ELF, applyFixupThumbErrors) {
149
151
EXPECT_THAT_ERROR (applyFixup (*G, BThumb, E, ArmCfg),
150
152
FailedWithMessage (testing::AllOf (
151
153
testing::StartsWith (" Invalid opcode" ),
152
- testing::EndsWith (G-> getEdgeKindName (K)))));
154
+ testing::EndsWith (aarch32:: getEdgeKindName (K)))));
153
155
}
154
156
}
0 commit comments