From ea54b823a3a02f65c865e11bbbccb327a273c039 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Fri, 10 Jul 2020 18:28:56 +0000 Subject: Revert "Switch to LLVM prebuilt tools for ART gtests" This reverts commit 8070443ce4b31a6787c22490f18f838f8f6ed4be. Reason for revert: Failing on chrome buildbots. Test: None Bug: 137817558 Change-Id: I4cbb4898e859ce33560592dd63cbf4a413048662 --- compiler/debug/dwarf/dwarf_test.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'compiler/debug/dwarf/dwarf_test.h') 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 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); } } -- cgit v1.2.3-59-g8ed1b