From 29872606d220420d53fde7cc5e3bea15f8da62e7 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Sun, 1 Sep 2019 09:12:37 +0000 Subject: [lldb] Restructure test folders to match LLDB command hierarchy Summary: As discussed on lldb-dev, this patch moves some LLDB tests into a hierarchy that more closely resembles the commands we use in the LLDB interpreter. This patch should only move tests that use the command interpreter and shouldn't touch any tests that primarily test the SB API. Reviewers: #lldb, jfb, JDevlieghere Reviewed By: #lldb, JDevlieghere Subscribers: dexonsmith, arphaman, JDevlieghere, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D67033 llvm-svn: 370605 --- .../test/expression_command/options/Makefile | 5 -- .../expression_command/options/TestExprOptions.py | 91 ---------------------- .../test/expression_command/options/foo.cpp | 11 --- .../test/expression_command/options/main.cpp | 17 ---- 4 files changed, 124 deletions(-) delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp (limited to 'lldb/packages/Python/lldbsuite/test/expression_command/options') diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile deleted file mode 100644 index 81ae6f6f16e..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -LEVEL = ../../make - -CXX_SOURCES := main.cpp foo.cpp - -include $(LEVEL)/Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py b/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py deleted file mode 100644 index 8af0ea1ba0c..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py +++ /dev/null @@ -1,91 +0,0 @@ -""" -Test expression command options. - -Test cases: - -o test_expr_options: - Test expression command options. -""" - -from __future__ import print_function - - -import lldb -import lldbsuite.test.lldbutil as lldbutil -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * - - -class ExprOptionsTestCase(TestBase): - - mydir = TestBase.compute_mydir(__file__) - - def setUp(self): - # Call super's setUp(). - TestBase.setUp(self) - - self.main_source = "main.cpp" - self.main_source_spec = lldb.SBFileSpec(self.main_source) - self.line = line_number('main.cpp', '// breakpoint_in_main') - self.exe = self.getBuildArtifact("a.out") - - def test_expr_options(self): - """These expression command options should work as expected.""" - self.build() - - # Set debugger into synchronous mode - self.dbg.SetAsync(False) - - (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint( - self, '// breakpoint_in_main', self.main_source_spec) - - frame = thread.GetFrameAtIndex(0) - options = lldb.SBExpressionOptions() - - # test --language on C++ expression using the SB API's - - # Make sure we can evaluate a C++11 expression. - val = frame.EvaluateExpression('foo != nullptr') - self.assertTrue(val.IsValid()) - self.assertTrue(val.GetError().Success()) - self.DebugSBValue(val) - - # Make sure it still works if language is set to C++11: - options.SetLanguage(lldb.eLanguageTypeC_plus_plus_11) - val = frame.EvaluateExpression('foo != nullptr', options) - self.assertTrue(val.IsValid()) - self.assertTrue(val.GetError().Success()) - self.DebugSBValue(val) - - # Make sure it fails if language is set to C: - options.SetLanguage(lldb.eLanguageTypeC) - val = frame.EvaluateExpression('foo != nullptr', options) - self.assertTrue(val.IsValid()) - self.assertFalse(val.GetError().Success()) - - @skipIfDarwin - def test_expr_options_lang(self): - """These expression language options should work as expected.""" - self.build() - - # Set debugger into synchronous mode - self.dbg.SetAsync(False) - - (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint( - self, '// breakpoint_in_main', self.main_source_spec) - - frame = thread.GetFrameAtIndex(0) - options = lldb.SBExpressionOptions() - - # Make sure we can retrieve `id` variable if language is set to C++11: - options.SetLanguage(lldb.eLanguageTypeC_plus_plus_11) - val = frame.EvaluateExpression('id == 0', options) - self.assertTrue(val.IsValid()) - self.assertTrue(val.GetError().Success()) - self.DebugSBValue(val) - - # Make sure we can't retrieve `id` variable if language is set to ObjC: - options.SetLanguage(lldb.eLanguageTypeObjC) - val = frame.EvaluateExpression('id == 0', options) - self.assertTrue(val.IsValid()) - self.assertFalse(val.GetError().Success()) diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp deleted file mode 100644 index 8a5a6a2b541..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp +++ /dev/null @@ -1,11 +0,0 @@ -namespace ns { - int func(void) - { - return 0; - } -} - -extern "C" int foo(void) -{ - return ns::func(); -} diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp deleted file mode 100644 index 0d30c79bd22..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp +++ /dev/null @@ -1,17 +0,0 @@ -extern "C" int foo(void); -static int static_value = 0; -static int id = 1234; - -int -bar() -{ - static_value++; - id++; - return static_value + id; -} - -int main (int argc, char const *argv[]) -{ - bar(); // breakpoint_in_main - return foo(); -} -- cgit v1.2.3