summaryrefslogtreecommitdiffstats
path: root/lldb/unittests/Disassembler/TestArmv7Disassembly.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/unittests/Disassembler/TestArmv7Disassembly.cpp')
-rw-r--r--lldb/unittests/Disassembler/TestArmv7Disassembly.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lldb/unittests/Disassembler/TestArmv7Disassembly.cpp b/lldb/unittests/Disassembler/TestArmv7Disassembly.cpp
index 005aae51214..600d7933084 100644
--- a/lldb/unittests/Disassembler/TestArmv7Disassembly.cpp
+++ b/lldb/unittests/Disassembler/TestArmv7Disassembly.cpp
@@ -67,7 +67,10 @@ TEST_F(TestArmv7Disassembly, TestCortexFPDisass) {
disass_sp = Disassembler::DisassembleBytes(arch, nullptr, nullptr, start_addr,
&data, sizeof (data), num_of_instructions, false);
- ASSERT_NE (nullptr, disass_sp.get());
+ // If we failed to get a disassembler, we can assume it is because
+ // the llvm we linked against was not built with the ARM target,
+ // and we should skip these tests without marking anything as failing.
+
if (disass_sp) {
const InstructionList inst_list (disass_sp->GetInstructionList());
EXPECT_EQ (num_of_instructions, inst_list.GetSize());
OpenPOWER on IntegriCloud