Skip to content

Commit 956ff0f

Browse files
committed
If we fail to get an armv7em-- disassembler from llvm, skip the
tests and don't mark this as a failure. This happens when we've linked against an llvm without the ARM target built in. Davide added some cmake conditionals to avoid building this test when the target was absent from llvm's build, but we're still finding some bots that manage to get in this situation. <rdar://problem/44270082> llvm-svn: 342072
1 parent a4ce437 commit 956ff0f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

lldb/unittests/Disassembler/TestArmv7Disassembly.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ TEST_F(TestArmv7Disassembly, TestCortexFPDisass) {
6767
disass_sp = Disassembler::DisassembleBytes(arch, nullptr, nullptr, start_addr,
6868
&data, sizeof (data), num_of_instructions, false);
6969

70-
ASSERT_NE (nullptr, disass_sp.get());
70+
// If we failed to get a disassembler, we can assume it is because
71+
// the llvm we linked against was not built with the ARM target,
72+
// and we should skip these tests without marking anything as failing.
73+
7174
if (disass_sp) {
7275
const InstructionList inst_list (disass_sp->GetInstructionList());
7376
EXPECT_EQ (num_of_instructions, inst_list.GetSize());

0 commit comments

Comments
 (0)