summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/functionalities
diff options
context:
space:
mode:
authorPavel Labath <pavel@labath.sk>2019-08-30 09:07:42 +0000
committerPavel Labath <pavel@labath.sk>2019-08-30 09:07:42 +0000
commit12a7e6c09cda7fd0259be85c949cf87b040bf1b7 (patch)
treeb850673262a91f265cafa016e74a3f4c6b5cb37a /lldb/packages/Python/lldbsuite/test/functionalities
parentb35d4699d093c7852a558763f96be7b3cac7f6d6 (diff)
downloadbcm5719-llvm-12a7e6c09cda7fd0259be85c949cf87b040bf1b7.tar.gz
bcm5719-llvm-12a7e6c09cda7fd0259be85c949cf87b040bf1b7.zip
dotest: improvements to the pexpect tests
Summary: While working on r370054, i've found it frustrating that the test output was compeletely unhelpful in case of failures. Therefore I've decided to improve that. In this I reuse the PExpectTest class, which was one of our mechanisms for running pexpect tests, but which has gotten orhpaned in the mean time. I've replaced the existing send methods with a "expect" method, which I've tried to design so that it has a similar interface to the expect method in regular non-pexpect dotest tests (as it essentially does something very similar). I've kept the ability to dump the transcript of the pexpect communication to stdout in the "trace" mode, as that is a very handy way to figure out what the test is doing. I've also removed the "expect_string" method used in the existing tests -- I've found this to be unhelpful because it hides the message that would be normally displayed by the EOF exception. Although vebose, this message includes some important information, like what strings we were searching for, what were the last bits of lldb output, etc. I've also beefed up the class to automatically disable the debug info test duplication, and auto-skip tests when the host platform does not support pexpect. This patch ports TestMultilineCompletion and TestIOHandlerCompletion to the new class. It also deletes TestFormats as it is not testing anything (definitely not formats) -- it was committed with the test code commented out (r228207), and then the testing code was deleted in r356000. Reviewers: teemperor, JDevlieghere, davide Subscribers: aprantl, lldb-commits Differential Revision: https://reviews.llvm.org/D66954 llvm-svn: 370449
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities')
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/format/Makefile5
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py38
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/format/main.c14
3 files changed, 0 insertions, 57 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/format/Makefile
deleted file mode 100644
index 0d70f259501..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/format/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../make
-
-C_SOURCES := main.c
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py b/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
deleted file mode 100644
index f0ed845e8ae..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-Test the command history mechanism
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class TestFormats(TestBase):
-
- mydir = TestBase.compute_mydir(__file__)
-
- @expectedFailureAll(
- hostoslist=["windows"],
- bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
- def test_formats(self):
- """Test format string functionality."""
- self.build()
- exe = self.getBuildArtifact("a.out")
- import pexpect
- prompt = "(lldb) "
- child = pexpect.spawn(
- '%s %s -x -o "b main" -o r %s' %
- (lldbtest_config.lldbExec, self.lldbOption, exe))
- # So that the spawned lldb session gets shutdown durng teardown.
- self.child = child
-
- # Substitute 'Help!' for 'help' using the 'commands regex' mechanism.
- child.expect_exact(prompt + 'target create "%s"' % exe)
- child.expect_exact(prompt + 'b main')
- child.expect_exact(prompt + 'r')
- child.expect_exact(prompt)
- child.sendline()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/format/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/format/main.c
deleted file mode 100644
index b37bb22de77..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/format/main.c
+++ /dev/null
@@ -1,14 +0,0 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <stdio.h>
-int main (int argc, char const *argv[])
-{
- printf("testing\n");
- return 0;
-}
OpenPOWER on IntegriCloud