diff options
author | Raphael Isemann <teemperor@gmail.com> | 2019-08-21 14:22:59 +0000 |
---|---|---|
committer | Raphael Isemann <teemperor@gmail.com> | 2019-08-21 14:22:59 +0000 |
commit | 717717b1ff8b6ee48331a86feaf2f68b28b6c9d8 (patch) | |
tree | 32cd8cdae4f0c35e0f882437f1f2cbc527a3f85c /lldb/packages/Python/lldbsuite/test | |
parent | ed413074f2064f41bf2e27f3f35a8fda3e7ffdc8 (diff) | |
download | bcm5719-llvm-717717b1ff8b6ee48331a86feaf2f68b28b6c9d8.tar.gz bcm5719-llvm-717717b1ff8b6ee48331a86feaf2f68b28b6c9d8.zip |
[lldb][NFC] Merge multiple TestApropos.py
That's cleaner and makes lldb-dotest no longer fail due to conflicting names.
llvm-svn: 369530
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py | 10 | ||||
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/help/TestApropos.py | 26 |
2 files changed, 10 insertions, 26 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py b/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py index f84477159d4..c4337c7301f 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py @@ -17,3 +17,13 @@ class AproposTestCase(TestBase): substrs=[' must be called with exactly one argument']) self.expect("apropos ''", error=True, substrs=['\'\' is not a valid search word']) + + @no_debug_info_test + def test_apropos_variable(self): + """Test that 'apropos variable' prints the fully qualified command name""" + self.expect( + 'apropos variable', + substrs=[ + 'frame variable', + 'target variable', + 'watchpoint set variable']) diff --git a/lldb/packages/Python/lldbsuite/test/help/TestApropos.py b/lldb/packages/Python/lldbsuite/test/help/TestApropos.py deleted file mode 100644 index f48d51222ad..00000000000 --- a/lldb/packages/Python/lldbsuite/test/help/TestApropos.py +++ /dev/null @@ -1,26 +0,0 @@ -""" -Test some lldb apropos commands. -""" - -from __future__ import print_function - - -import lldb -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class AproposCommandTestCase(TestBase): - - mydir = TestBase.compute_mydir(__file__) - - @no_debug_info_test - def test_apropos_variable(self): - """Test that 'apropos variable' prints the fully qualified command name""" - self.expect( - 'apropos variable', - substrs=[ - 'frame variable', - 'target variable', - 'watchpoint set variable']) |