[Lldb-commits] [lldb] c888694 - [LLDB] Fix timeout value on expect_gdbremote_sequence

[Muhammad Omair Javaid via lldb-commits]

Author: Muhammad Omair Javaid
Date: 2020-08-08T23:57:08+05:00
New Revision: c888694a8edaf2794fc5960a3c1087fbed37ba92

URL: https://github.com/llvm/llvm-project/commit/c888694a8edaf2794fc5960a3c1087fbed37ba92
DIFF: https://github.com/llvm/llvm-project/commit/c888694a8edaf2794fc5960a3c1087fbed37ba92.diff

LOG: [LLDB] Fix timeout value on expect_gdbremote_sequence

D83904 seems to have changed timeout value on expect_gdbremote_sequence which
was 120 previously. This seems to be causing intermittent failures on
lldb-aarch64-ubuntu buildbot.

This patch fixes the timeout value to see the impact on test suite.

Example:
http://lab.llvm.org:8011/builders/lldb-aarch64-ubuntu/builds/7401/steps/test/logs/stdio

Differential Revision: https://reviews.llvm.org/D85514

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
    lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
index 71e6fdd8857f..cea0fee3aaaf 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -703,7 +703,7 @@ def expect_gdbremote_sequence(self):
             self.sock,
             self.test_sequence,
             self._pump_queues,
-            self.DEFAULT_TIMEOUT,
+            self.DEFAULT_TIMEOUT * len(self.test_sequence),
             self.logger)
 
     _KNOWN_REGINFO_KEYS = [

diff  --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
index e0ea38c78840..0c01bdfb1c69 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
@@ -809,6 +809,9 @@ def __init__(self, logger):
         self.entries = []
         self.logger = logger
 
+    def __len__(self):
+        return len(self.entries)
+
     def add_log_lines(self, log_lines, remote_input_is_read):
         for line in log_lines:
             if isinstance(line, str):