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 <test-case>.<test-function>" 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 "<test-function>_<debug-info>"
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
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index b7db698..4aa9218 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -31,17 +31,15 @@
self.assertTrue(lldbgdbserverutils.process_is_running(pid, True))
@debugserver_test
- @dsym_test
- def test_qProcessInfo_returns_running_process_debugserver_dsym(self):
+ def test_qProcessInfo_returns_running_process_debugserver(self):
self.init_debugserver_test()
- self.buildDsym()
+ self.build()
self.qProcessInfo_returns_running_process()
@llgs_test
- @dwarf_test
- def test_qProcessInfo_returns_running_process_llgs_dwarf(self):
+ def test_qProcessInfo_returns_running_process_llgs(self):
self.init_llgs_test()
- self.buildDwarf()
+ self.build()
self.qProcessInfo_returns_running_process()
def attach_commandline_qProcessInfo_reports_correct_pid(self):
@@ -64,18 +62,16 @@
self.assertEqual(reported_pid, procs["inferior"].pid)
@debugserver_test
- @dsym_test
- def test_attach_commandline_qProcessInfo_reports_correct_pid_debugserver_dsym(self):
+ def test_attach_commandline_qProcessInfo_reports_correct_pid_debugserver(self):
self.init_debugserver_test()
- self.buildDsym()
+ self.build()
self.set_inferior_startup_attach()
self.attach_commandline_qProcessInfo_reports_correct_pid()
@llgs_test
- @dwarf_test
- def test_attach_commandline_qProcessInfo_reports_correct_pid_llgs_dwarf(self):
+ def test_attach_commandline_qProcessInfo_reports_correct_pid_llgs(self):
self.init_llgs_test()
- self.buildDwarf()
+ self.build()
self.set_inferior_startup_attach()
self.attach_commandline_qProcessInfo_reports_correct_pid()
@@ -97,17 +93,15 @@
self.assertTrue(endian in ["little", "big", "pdp"])
@debugserver_test
- @dsym_test
- def test_qProcessInfo_reports_valid_endian_debugserver_dsym(self):
+ def test_qProcessInfo_reports_valid_endian_debugserver(self):
self.init_debugserver_test()
- self.buildDsym()
+ self.build()
self.qProcessInfo_reports_valid_endian()
@llgs_test
- @dwarf_test
- def test_qProcessInfo_reports_valid_endian_llgs_dwarf(self):
+ def test_qProcessInfo_reports_valid_endian_llgs(self):
self.init_llgs_test()
- self.buildDwarf()
+ self.build()
self.qProcessInfo_reports_valid_endian()
def qProcessInfo_contains_keys(self, expected_key_set):
@@ -152,26 +146,23 @@
@skipUnlessDarwin
@debugserver_test
- @dsym_test
def test_qProcessInfo_contains_cputype_cpusubtype_debugserver_darwin(self):
self.init_debugserver_test()
- self.buildDsym()
+ self.build()
self.qProcessInfo_contains_keys(set(['cputype', 'cpusubtype']))
@skipUnlessPlatform(["linux"])
@llgs_test
- @dwarf_test
def test_qProcessInfo_contains_triple_llgs_linux(self):
self.init_llgs_test()
- self.buildDwarf()
+ self.build()
self.qProcessInfo_contains_keys(set(['triple']))
@skipUnlessDarwin
@debugserver_test
- @dsym_test
def test_qProcessInfo_does_not_contain_triple_debugserver_darwin(self):
self.init_debugserver_test()
- self.buildDsym()
+ self.build()
# We don't expect to see triple on darwin. If we do, we'll prefer triple
# to cputype/cpusubtype and skip some darwin-based ProcessGDBRemote ArchSpec setup
# for the remote Host and Process.
@@ -179,10 +170,9 @@
@skipUnlessPlatform(["linux"])
@llgs_test
- @dwarf_test
def test_qProcessInfo_does_not_contain_cputype_cpusubtype_llgs_linux(self):
self.init_llgs_test()
- self.buildDwarf()
+ self.build()
self.qProcessInfo_does_not_contain_keys(set(['cputype', 'cpusubtype']))