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

Fix for bugpoint -remote-client 

llvm-svn: 75665
This commit is contained in:
Viktor Kutuzov 2009-07-14 19:10:55 +00:00
parent fecff3661f
commit 1518de130e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/tools/bugpoint/ToolRunner.cpp
View File

@ -635,6 +635,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
std::vector<const char*> ProgramArgs; std::vector<const char*> ProgramArgs;
std::string Exec;
if (RemoteClientPath.isEmpty()) if (RemoteClientPath.isEmpty())
ProgramArgs.push_back(OutputBinary.c_str()); ProgramArgs.push_back(OutputBinary.c_str());
else { else {
@ -650,10 +651,10 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
ProgramArgs.push_back(RemoteExtra.c_str()); ProgramArgs.push_back(RemoteExtra.c_str());
} }
// Full path to the binary
char* env_pwd = getenv("PWD"); char* env_pwd = getenv("PWD");
std::string Exec = "cd ";
Exec += env_pwd; Exec += env_pwd;
Exec += "; ./"; Exec += "/";
Exec += OutputBinary.c_str(); Exec += OutputBinary.c_str();
ProgramArgs.push_back(Exec.c_str()); ProgramArgs.push_back(Exec.c_str());
} }
@ -673,14 +674,21 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
FileRemover OutputBinaryRemover(OutputBinary); FileRemover OutputBinaryRemover(OutputBinary);
if (RemoteClientPath.isEmpty()) if (RemoteClientPath.isEmpty()) {
DEBUG(std::cerr << "<run locally>" << std::flush;);
return RunProgramWithTimeout(OutputBinary, &ProgramArgs[0], return RunProgramWithTimeout(OutputBinary, &ProgramArgs[0],
sys::Path(InputFile), sys::Path(OutputFile), sys::Path(OutputFile), sys::Path(InputFile), sys::Path(OutputFile), sys::Path(OutputFile),
Timeout, MemoryLimit); Timeout, MemoryLimit);
else } else {
return RunProgramWithTimeout(sys::Path(RemoteClientPath), &ProgramArgs[0], std::cout << "<run remotely>" << std::flush;
sys::Path(InputFile), sys::Path(OutputFile), sys::Path(OutputFile), int RemoteClientStatus = RunProgramWithTimeout(sys::Path(RemoteClientPath),
Timeout, MemoryLimit); &ProgramArgs[0], sys::Path(InputFile), sys::Path(OutputFile),
sys::Path(OutputFile), Timeout, MemoryLimit);
if (RemoteClientStatus != 0) {
std::cerr << "Remote Client failed with an error: " <<
RemoteClientStatus << ".\n" << std::flush;
}
}
} }
int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType, int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType,