Re-enable most lldb-vscode tests on Linux.

Summary:
After https://reviews.llvm.org/D59828 and https://reviews.llvm.org/D59849,
I believe the problems with these tests hanging have been solved.

I tried enabling all of them on my machine, and got two failures:

- One of them was spawning a child process that lives for 5 seconds, waited
  for 5 seconds to attach to the child, and failed because the child wasn't
  there.

- The other one was a legit failure because shell expansion of arguments doesn't
  work on Linux.

This tests enables all lldb-vscode tests on Linux except for "launch process
with shell expansion of args" (which doesn't work), and fixes the other broken
test by reducing the time it waits before attaching to its child process.

Reviewers: zturner, clayborg

Subscribers: lldb-commits

Tags: #lldb

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

llvm-svn: 357633

4 files changed, 5 insertions, 20 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/TestVSCode_attach.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/TestVSCode_attach.py
index 21e945bee73..2cac88fa0d4 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/TestVSCode_attach.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/TestVSCode_attach.py
@@ -47,7 +47,6 @@ class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @skipIfNetBSD # Hangs on NetBSD as well
     @no_debug_info_test
     def test_by_pid(self):
@@ -65,7 +64,6 @@ class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @skipIfNetBSD # Hangs on NetBSD as well
     @no_debug_info_test
     def test_by_name(self):
@@ -94,14 +92,14 @@ class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase):
                                         stdin=subprocess.PIPE,
                                         stdout=subprocess.PIPE,
                                         stderr=subprocess.PIPE)
-        # Wait for a bit to ensure the process is launched
-        time.sleep(5)
+        # Wait for a bit to ensure the process is launched, but not for so long
+        # that the process has already finished by the time we attach.
+        time.sleep(3)
         self.attach(program=program)
         self.set_and_hit_breakpoint(continueToExit=True)
 
     @skipUnlessDarwin
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @skipIfNetBSD # Hangs on NetBSD as well
     @no_debug_info_test
     def test_by_name_waitFor(self):
@@ -120,7 +118,6 @@ class TestVSCode_attach(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @skipIfNetBSD # Hangs on NetBSD as well
     @no_debug_info_test
     def test_commands(self):
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/main.c b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/main.c
index a078d42203e..123ead2fa65 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/main.c
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/main.c
@@ -3,6 +3,6 @@
 
 int main(int argc, char const *argv[]) {
   printf("pid = %i\n", getpid());
-  sleep(5);
+  sleep(10);
   return 0; // breakpoint 1
 }
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
index a175b2f5ba6..8a3f3549f6e 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/TestVSCode_setFunctionBreakpoints.py
@@ -21,7 +21,6 @@ class TestVSCode_setFunctionBreakpoints(
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # test hangs on linux under heavy load
     @no_debug_info_test
     def test_set_and_clear(self):
         '''Tests setting and clearing function breakpoints.
@@ -114,7 +113,6 @@ class TestVSCode_setFunctionBreakpoints(
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # test hangs on linux under heavy load
     @no_debug_info_test
     def test_functionality(self):
         '''Tests hitting breakpoints and the functionality of a single
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py
index 759045ef4c4..5c996fbee45 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py
@@ -21,7 +21,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_default(self):
         '''
@@ -41,7 +40,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_stopOnEntry(self):
         '''
@@ -63,7 +61,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_cwd(self):
         '''
@@ -92,7 +89,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_debuggerRoot(self):
         '''
@@ -122,7 +118,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_sourcePath(self):
         '''
@@ -150,7 +145,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_disableSTDIO(self):
         '''
@@ -167,7 +161,7 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
+    @skipIfLinux # shell argument expansion doesn't seem to work on Linux
     @expectedFailureNetBSD
     @no_debug_info_test
     def test_shellExpandArguments_enabled(self):
@@ -194,7 +188,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_shellExpandArguments_disabled(self):
         '''
@@ -222,7 +215,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_args(self):
         '''
@@ -250,7 +242,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_environment(self):
         '''
@@ -285,7 +276,6 @@ class TestVSCode_launch(lldbvscode_testcase.VSCodeTestCaseBase):
 
     @skipIfWindows
     @skipIfDarwin # Skip this test for now until we can figure out why tings aren't working on build bots
-    @skipIfLinux # This test is timing out and/or failing on Linux as well as Darwin
     @no_debug_info_test
     def test_commands(self):
         '''