diff options
Diffstat (limited to 'compiler/debug/dwarf/dwarf_test.h')
| -rw-r--r-- | compiler/debug/dwarf/dwarf_test.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/debug/dwarf/dwarf_test.h b/compiler/debug/dwarf/dwarf_test.h index bad986a330..caa7437162 100644 --- a/compiler/debug/dwarf/dwarf_test.h +++ b/compiler/debug/dwarf/dwarf_test.h @@ -86,7 +86,7 @@ class DwarfTest : public CommonCompilerTest { // Read the elf file back using objdump. std::vector<std::string> lines; - std::string cmd = GetAndroidTool("llvm-dwarfdump"); + std::string cmd = GetAndroidTool("objdump"); cmd = cmd + " " + args + " " + file.GetFilename() + " 2>&1"; FILE* output = popen(cmd.data(), "r"); char buffer[1024]; @@ -96,13 +96,12 @@ class DwarfTest : public CommonCompilerTest { printf("%s", line); } if (line[0] != '\0' && line[0] != '\n') { - EXPECT_TRUE(strstr(line, "error:") == nullptr) << line; - EXPECT_TRUE(strstr(line, "warning:") == nullptr) << line; + EXPECT_TRUE(strstr(line, "objdump: Error:") == nullptr) << line; + EXPECT_TRUE(strstr(line, "objdump: Warning:") == nullptr) << line; std::string str(line); if (str.back() == '\n') { str.pop_back(); } - std::replace(str.begin(), str.end(), '\t', ' '); lines.push_back(str); } } |