RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 20:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make llvm-nm return 1 on error.

Browse Source 
This is a small compatibility improvement with gnu nm and makes llvm-nm more
useful as a testing tool.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185546 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-07-03 15:46:03 +00:00
parent f6b67dc7f8
commit 40d40dd44e
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/Object/nm-error.test Normal file
View File

@ -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

8
tools/llvm-nm/llvm-nm.cpp
View File

@ -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;
}