From c8fd130a2cbf7ade53d05e597f9d48e8c2f37442 Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Wed, 30 Sep 2015 10:12:40 +0000 Subject: Merge dwarf and dsym tests Currently most of the test files have a separate dwarf and a separate dsym test with almost identical content (only the build step is different). With adding dwo symbol file handling to the test suit it would increase this to a 3-way duplication. The purpose of this change is to eliminate this redundancy with generating 2 test case (one dwarf and one dsym) for each test function specified (dwo handling will be added at a later commit). Main design goals: * There should be no boilerplate code in each test file to support the multiple debug info in most of the tests (custom scenarios are acceptable in special cases) so adding a new test case is easier and we can't miss one of the debug info type. * In case of a test failure, the debug symbols used during the test run have to be cleanly visible from the output of dotest.py to make debugging easier both from build bot logs and from local test runs * Each test case should have a unique, fully qualified name so we can run exactly 1 test with "-f ." syntax * Test output should be grouped based on test files the same way as it happens now (displaying dwarf/dsym results separately isn't preferable) Proposed solution (main logic in lldbtest.py, rest of them are test cases fixed up for the new style): * Have only 1 test fuction in the test files what will run for all debug info separately and this test function should call just "self.build(...)" to build an inferior with the right debug info * When a class is created by python (the class object, not the class instance), we will generate a new test method for each debug info format in the test class with the name "_" and remove the original test method. This way unittest2 see multiple test methods (1 for each debug info, pretty much as of now) and will handle the test selection and the failure reporting correctly (the debug info will be visible from the end of the test name) * Add new annotation @no_debug_info_test to disable the generation of multiple tests for each debug info format when the test don't have an inferior Differential revision: http://reviews.llvm.org/D13028 llvm-svn: 248883 --- .../thread/exit_during_step/TestExitDuringStep.py | 73 ++++------------------ 1 file changed, 12 insertions(+), 61 deletions(-) (limited to 'lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py') diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py index 0908bbd217d..a69bb7f2a76 100644 --- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -12,68 +12,35 @@ class ExitDuringStepTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @skipUnlessDarwin - @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained - @dsym_test - def test_thread_state_is_stopped_with_dsym(self): - """Test thread exit during step handling.""" - self.buildDsym(dictionary=self.getBuildFlags()) - self.thread_state_is_stopped() - @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained @expectedFailureLinux("llvm.org/pr15824") # thread states not properly maintained @expectedFailureWindows("llvm.org/pr24681") - @dwarf_test - def test_thread_state_is_stopped_with_dwarf(self): + def test_thread_state_is_stopped(self): """Test thread exit during step handling.""" - self.buildDwarf(dictionary=self.getBuildFlags()) - self.thread_state_is_stopped() - - @skipUnlessDarwin - @dsym_test - def test_with_dsym(self): - """Test thread exit during step handling.""" - self.buildDsym(dictionary=self.getBuildFlags()) - self.exit_during_step_inst_test() - - @skipUnlessDarwin - @dsym_test - def test_step_over_with_dsym(self): - """Test thread exit during step-over handling.""" - self.buildDsym(dictionary=self.getBuildFlags()) - self.exit_during_step_over_test() - - @skipUnlessDarwin - @dsym_test - def test_step_in_with_dsym(self): - """Test thread exit during step-in handling.""" - self.buildDsym(dictionary=self.getBuildFlags()) - self.exit_during_step_in_test() + self.build(dictionary=self.getBuildFlags()) + self.exit_during_step_base("thread step-in -m all-threads", 'stop reason = step in', True) @skipIfFreeBSD # llvm.org/pr21411: test is hanging @expectedFailureWindows("llvm.org/pr24681") - @dwarf_test - def test_with_dwarf(self): + def test(self): """Test thread exit during step handling.""" - self.buildDwarf(dictionary=self.getBuildFlags()) - self.exit_during_step_inst_test() + self.build(dictionary=self.getBuildFlags()) + self.exit_during_step_base("thread step-inst -m all-threads", 'stop reason = instruction step', False) @skipIfFreeBSD # llvm.org/pr21411: test is hanging @expectedFailureWindows("llvm.org/pr24681") - @dwarf_test - def test_step_over_with_dwarf(self): + def test_step_over(self): """Test thread exit during step-over handling.""" - self.buildDwarf(dictionary=self.getBuildFlags()) - self.exit_during_step_over_test() + self.build(dictionary=self.getBuildFlags()) + self.exit_during_step_base("thread step-over -m all-threads", 'stop reason = step over', False) @skipIfFreeBSD # llvm.org/pr21411: test is hanging @expectedFailureWindows("llvm.org/pr24681") - @dwarf_test - def test_step_in_with_dwarf(self): + def test_step_in(self): """Test thread exit during step-in handling.""" - self.buildDwarf(dictionary=self.getBuildFlags()) - self.exit_during_step_in_test() + self.build(dictionary=self.getBuildFlags()) + self.exit_during_step_base("thread step-in -m all-threads", 'stop reason = step in', False) def setUp(self): # Call super's setUp(). @@ -82,22 +49,6 @@ class ExitDuringStepTestCase(TestBase): self.breakpoint = line_number('main.cpp', '// Set breakpoint here') self.continuepoint = line_number('main.cpp', '// Continue from here') - def exit_during_step_inst_test(self): - """Test thread exit while using step-inst.""" - self.exit_during_step_base("thread step-inst -m all-threads", 'stop reason = instruction step', False) - - def exit_during_step_over_test(self): - """Test thread exit while using step-over.""" - self.exit_during_step_base("thread step-over -m all-threads", 'stop reason = step over', False) - - def exit_during_step_in_test(self): - """Test thread exit while using step-in.""" - self.exit_during_step_base("thread step-in -m all-threads", 'stop reason = step in', False) - - def thread_state_is_stopped (self): - """Go to first point where all threads are stopped, and test that the thread state is correctly set.""" - self.exit_during_step_base("thread step-in -m all-threads", 'stop reason = step in', True) - def exit_during_step_base(self, step_cmd, step_stop_reason, test_thread_state): """Test thread exit during step handling.""" exe = os.path.join(os.getcwd(), "a.out") -- cgit v1.2.3