[Lldb-commits] [lldb] r331974 - Fix windows&mac builds broken by r331970 (RunShellCommand/Timeout) refactor

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Thu May 10 04:27:44 PDT 2018


Author: labath
Date: Thu May 10 04:27:43 2018
New Revision: 331974

URL: http://llvm.org/viewvc/llvm-project?rev=331974&view=rev
Log:
Fix windows&mac builds broken by r331970 (RunShellCommand/Timeout) refactor

Modified:
    lldb/trunk/source/Host/macosx/Symbols.cpp
    lldb/trunk/source/Host/windows/Host.cpp

Modified: lldb/trunk/source/Host/macosx/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Symbols.cpp?rev=331974&r1=331973&r2=331974&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Symbols.cpp (original)
+++ lldb/trunk/source/Host/macosx/Symbols.cpp Thu May 10 04:27:43 2018
@@ -571,8 +571,9 @@ bool Symbols::DownloadObjectAndSymbolFil
             &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(),

Modified: lldb/trunk/source/Host/windows/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/Host.cpp?rev=331974&r1=331973&r2=331974&view=diff
==============================================================================
--- lldb/trunk/source/Host/windows/Host.cpp (original)
+++ lldb/trunk/source/Host/windows/Host.cpp Thu May 10 04:27:43 2018
@@ -207,7 +207,7 @@ Status Host::ShellExpandArguments(Proces
     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",




More information about the lldb-commits mailing list