diff options
| -rw-r--r-- | test/Object/nm-error.test | 17 | ||||
| -rw-r--r-- | tools/llvm-nm/llvm-nm.cpp | 8 |
2 files changed, 25 insertions, 0 deletions
diff --git a/test/Object/nm-error.test b/test/Object/nm-error.test new file mode 100644 index 0000000000..146b88713f --- /dev/null +++ b/test/Object/nm-error.test @@ -0,0 +1,17 @@ +Test that llvm-nm returns an error because of the unknown file type, but +keeps processing subsequent files. + +Note: We use a temporary file since the tests don't run with pipefail. + +RUN: touch %t +RUN: not llvm-nm %p/Inputs/trivial-object-test.elf-i386 %t \ +RUN: %p/Inputs/trivial-object-test.elf-i386 > %t.log +RUN: FileCheck %s < %t.log + +CHECK: U SomeOtherFunction +CHECK: 00000000 T main +CHECK: U puts + +CHECK: U SomeOtherFunction +CHECK: 00000000 T main +CHECK: U puts diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index cb46520763..c33289bd87 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -121,6 +121,8 @@ namespace { bool MultipleFiles = false; + bool HadError = false; + std::string ToolName; } @@ -132,6 +134,7 @@ static void error(Twine message, Twine path = Twine()) { static bool error(error_code ec, Twine path = Twine()) { if (ec) { error(ec.message(), path); + HadError = true; return true; } return false; @@ -429,6 +432,7 @@ static void DumpSymbolNamesFromFile(std::string &Filename) { } else { errs() << ToolName << ": " << Filename << ": " << "unrecognizable file type\n"; + HadError = true; return; } } @@ -463,5 +467,9 @@ int main(int argc, char **argv) { std::for_each(InputFilenames.begin(), InputFilenames.end(), DumpSymbolNamesFromFile); + + if (HadError) + return 1; + return 0; } |