RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-29 22:30:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve error message of FileCheck when stdin is empty

Browse Source 
Summary: Replace '-' in the error message with <stdin>. This is also consistent with another error message in the code.

Reviewers: jhenderson, probinson, jdenny, grimar, arichardson

Reviewed By: jhenderson

Subscribers: thopre, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D73793
This commit is contained in:
David Bozier 2020-02-03 15:13:31 +00:00
parent 8276f3701d
commit 3e5a3b434c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/FileCheck/check-empty.txt
View File

@ -17,7 +17,7 @@
; FOO: foo
; NOFOO-NOT: foo
; EMPTY-ERR: FileCheck error: '-' is empty.
; EMPTY-ERR: FileCheck error: '<stdin>' is empty.
; EMPTY-ERR-NEXT: FileCheck command line: {{.*}}{{F|f}}ile{{C|c}}heck{{.*}}-check-prefix={{.*}}FOO {{.*}}check-empty.txt
; NO-EMPTY-ERR-NOT: FileCheck error: '-' is empty.
; NO-EMPTY-ERR-NOT: FileCheck error: '<stdin>' is empty.
; NOT-FOUND: error: FOO: expected string not found in input

4
utils/FileCheck/FileCheck.cpp
View File

@ -616,6 +616,8 @@ int main(int argc, char **argv) {
// Open the file to check and add it to SourceMgr.
ErrorOr<std::unique_ptr<MemoryBuffer>> InputFileOrErr =
MemoryBuffer::getFileOrSTDIN(InputFilename);
if (InputFilename == "-")
InputFilename = "<stdin>"; // Overwrite for improved diagnostic messages
if (std::error_code EC = InputFileOrErr.getError()) {
errs() << "Could not open input file '" << InputFilename
<< "': " << EC.message() << '\n';
@ -648,7 +650,7 @@ int main(int argc, char **argv) {
(ExitCode == 1 && DumpInput == DumpInputFail)) {
errs() << "\n"
<< "Input file: "
<< (InputFilename == "-" ? "<stdin>" : InputFilename.getValue())
<< InputFilename
<< "\n"
<< "Check file: " << CheckFilename << "\n"
<< "\n"