Fix windows&mac builds broken by r331970 (RunShellCommand/Timeout) refactor
authorPavel Labath <labath@google.com>
Thu, 10 May 2018 11:27:43 +0000 (11:27 +0000)
committerPavel Labath <labath@google.com>
Thu, 10 May 2018 11:27:43 +0000 (11:27 +0000)
llvm-svn: 331974

lldb/source/Host/macosx/Symbols.cpp
lldb/source/Host/windows/Host.cpp

index e172dd5..7127c5c 100644 (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(),
index 2ecc614..53c4e5a 100644 (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",