maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix these error messages to be less confusing. These error 

messages primarily indicate errors running the viewer, not
errors with the graph file itself.

llvm-svn: 117665
This commit is contained in:
Dan Gohman 2010-10-29 17:03:40 +00:00
parent fc81579b5e
commit e1db7f2005
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Support/GraphWriter.cpp
View File

@ -64,8 +64,7 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
errs() << "Running 'Graphviz' program... "; errs() << "Running 'Graphviz' program... ";
if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg)) { if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,0,&ErrMsg)) {
errs() << "Error viewing graph " << Filename.str() << ": " << ErrMsg errs() << "Error: " << ErrMsg << "\n";
<< "\n";
return; return;
} }
Filename.eraseFromDisk(); Filename.eraseFromDisk();
@ -90,8 +89,7 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
errs() << "Running 'xdot.py' program... "; errs() << "Running 'xdot.py' program... ";
if (sys::Program::ExecuteAndWait(sys::Path(LLVM_PATH_XDOT_PY), if (sys::Program::ExecuteAndWait(sys::Path(LLVM_PATH_XDOT_PY),
&args[0],0,0,0,0,&ErrMsg)) { &args[0],0,0,0,0,&ErrMsg)) {
errs() << "Error viewing graph " << Filename.str() << ": " << ErrMsg errs() << "Error: " << ErrMsg << "\n";
<< "\n";
return; return;
} }
Filename.eraseFromDisk(); Filename.eraseFromDisk();
@ -156,8 +154,7 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
errs() << "Running '" << prog.str() << "' program... "; errs() << "Running '" << prog.str() << "' program... ";
if (sys::Program::ExecuteAndWait(prog, &args[0], 0, 0, 0, 0, &ErrMsg)) { if (sys::Program::ExecuteAndWait(prog, &args[0], 0, 0, 0, 0, &ErrMsg)) {
errs() << "Error viewing graph " << Filename.str() << ": '" errs() << "Error: " << ErrMsg << "\n";
<< ErrMsg << "\n";
return; return;
} }
errs() << " done. \n"; errs() << " done. \n";
@ -172,7 +169,7 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
ErrMsg.clear(); ErrMsg.clear();
if (wait) { if (wait) {
if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg)) if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,0,&ErrMsg))
errs() << "Error viewing graph: " << ErrMsg << "\n"; errs() << "Error: " << ErrMsg << "\n";
Filename.eraseFromDisk(); Filename.eraseFromDisk();
PSFilename.eraseFromDisk(); PSFilename.eraseFromDisk();
} }
@ -191,8 +188,7 @@ void llvm::DisplayGraph(const sys::Path &Filename, bool wait,
errs() << "Running 'dotty' program... "; errs() << "Running 'dotty' program... ";
if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) { if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,0,&ErrMsg)) {
errs() << "Error viewing graph " << Filename.str() << ": " errs() << "Error: " << ErrMsg << "\n";
<< ErrMsg << "\n";
} else { } else {
// Dotty spawns another app and doesn't wait until it returns // Dotty spawns another app and doesn't wait until it returns
#if defined (__MINGW32__) || defined (_WINDOWS) #if defined (__MINGW32__) || defined (_WINDOWS)