From c7be982c836cdaf7b1ef303d903e6a3de2eb4a34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 3 Aug 2020 07:09:03 +0200 Subject: [PATCH] [lldb][gui] move TestGuiBasicDebug.py to lldb/test and update it Between the time it was created and it was pushed upstream, 99451b4453688a94c6014cac233d371ab4cc342d has moved the existing gui gui tests to lldb/test, so move this one too. And update it to contain TestGuiBasic.py changes since the time when it was based on that test. Differential Revision: https://reviews.llvm.org/D85106 --- .../lldbsuite/test => test/API}/commands/gui/basicdebug/Makefile | 0 .../API}/commands/gui/basicdebug/TestGuiBasicDebug.py | 8 ++++++++ .../lldbsuite/test => test/API}/commands/gui/basicdebug/func.c | 0 .../lldbsuite/test => test/API}/commands/gui/basicdebug/main.c | 0 4 files changed, 8 insertions(+) rename lldb/{packages/Python/lldbsuite/test => test/API}/commands/gui/basicdebug/Makefile (100%) rename lldb/{packages/Python/lldbsuite/test => test/API}/commands/gui/basicdebug/TestGuiBasicDebug.py (83%) rename lldb/{packages/Python/lldbsuite/test => test/API}/commands/gui/basicdebug/func.c (100%) rename lldb/{packages/Python/lldbsuite/test => test/API}/commands/gui/basicdebug/main.c (100%) diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/Makefile b/lldb/test/API/commands/gui/basicdebug/Makefile similarity index 100% rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/Makefile rename to lldb/test/API/commands/gui/basicdebug/Makefile diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/TestGuiBasicDebug.py b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py similarity index 83% rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/TestGuiBasicDebug.py rename to lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py index 54c763f..76d9d3b 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/TestGuiBasicDebug.py +++ b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py @@ -11,7 +11,11 @@ class TestGuiBasicDebugCommandTest(PExpectTest): mydir = TestBase.compute_mydir(__file__) + # PExpect uses many timeouts internally and doesn't play well + # under ASAN on a loaded machine.. + @skipIfAsan @skipIfCursesSupportMissing + @skipIfRemote # "run" command will not work correctly for remote debug def test_gui(self): self.build() @@ -39,4 +43,8 @@ class TestGuiBasicDebugCommandTest(PExpectTest): self.child.send("n") # step over self.child.expect("return 0;[^\r\n]+<<< Thread 1: step over") + # Press escape to quit the gui + self.child.send(escape_key) + + self.expect_prompt() self.quit() diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/func.c b/lldb/test/API/commands/gui/basicdebug/func.c similarity index 100% rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/func.c rename to lldb/test/API/commands/gui/basicdebug/func.c diff --git a/lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/main.c b/lldb/test/API/commands/gui/basicdebug/main.c similarity index 100% rename from lldb/packages/Python/lldbsuite/test/commands/gui/basicdebug/main.c rename to lldb/test/API/commands/gui/basicdebug/main.c -- 2.7.4