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

Fix windows&mac builds broken by r331970 (RunShellCommand/Timeout) refactor 

llvm-svn: 331974
This commit is contained in:
Pavel Labath 2018-05-10 11:27:43 +00:00
parent 6556aa6848
commit 70f4eaf699
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lldb/source/Host/macosx/Symbols.cpp
View File

@ -571,8 +571,9 @@ bool Symbols::DownloadObjectAndSymbolFile(ModuleSpec &module_spec,
&exit_status, // Exit status
&signo, // Signal int *
&command_output, // Command output
30, // Large timeout to allow for long dsym download times
false); // Don't run in a shell (we don't need shell expansion)
std::chrono::seconds(
30), // Large timeout to allow for long dsym download times
false); // Don't run in a shell (we don't need shell expansion)
if (error.Success() && exit_status == 0 && !command_output.empty()) {
CFCData data(CFDataCreateWithBytesNoCopy(
NULL, (const UInt8 *)command_output.data(), command_output.size(),

2
lldb/source/Host/windows/Host.cpp
View File

@ -207,7 +207,7 @@ Status Host::ShellExpandArguments(ProcessLaunchInfo &launch_info) {
std::string output;
std::string command = expand_command.GetString();
RunShellCommand(command.c_str(), launch_info.GetWorkingDirectory(), &status,
nullptr, &output, 10);
nullptr, &output, std::chrono::seconds(10));
if (status != 0) {
error.SetErrorStringWithFormat("lldb-argdumper exited with error %d",