Second batch of adding @dsym_test/@dwarf_test decorators to existing test cases.
Plus some minor cleanup of test method names.
Third and final batch is coming.
llvm-svn: 154197
diff --git a/lldb/test/python_api/event/TestEvents.py b/lldb/test/python_api/event/TestEvents.py
index f1243f2..a9a7edc 100644
--- a/lldb/test/python_api/event/TestEvents.py
+++ b/lldb/test/python_api/event/TestEvents.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_listen_for_and_print_event_with_dsym(self):
"""Exercise SBEvent API."""
self.buildDsym()
self.do_listen_for_and_print_event()
@python_api_test
+ @dwarf_test
def test_listen_for_and_print_event_with_dwarf(self):
"""Exercise SBEvent API."""
self.buildDwarf()
@@ -27,12 +29,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_wait_for_event_with_dsym(self):
"""Exercise SBListener.WaitForEvent() API."""
self.buildDsym()
self.do_wait_for_event()
@python_api_test
+ @dwarf_test
def test_wait_for_event_with_dwarf(self):
"""Exercise SBListener.WaitForEvent() API."""
self.buildDwarf()
@@ -40,13 +44,15 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
- def test_add_listener_to_broadcaster_dsym(self):
+ @dsym_test
+ def test_add_listener_to_broadcaster_with_dsym(self):
"""Exercise some SBBroadcaster APIs."""
self.buildDsym()
self.do_add_listener_to_broadcaster()
@python_api_test
- def test_add_listener_to_broadcaster_dwarf(self):
+ @dwarf_test
+ def test_add_listener_to_broadcaster_with_dwarf(self):
"""Exercise some SBBroadcaster APIs."""
self.buildDwarf()
self.do_add_listener_to_broadcaster()
diff --git a/lldb/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
index 52bf0f4..79359da 100644
--- a/lldb/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/test/python_api/formatters/TestFormattersSBAPI.py
@@ -11,6 +11,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym_formatters_api(self):
"""Test Python APIs for working with formatters"""
self.buildDsym()
@@ -18,6 +19,7 @@
self.formatters()
@python_api_test
+ @dwarf_test
def test_with_dwarf_formatters_api(self):
"""Test Python APIs for working with formatters"""
self.buildDwarf()
diff --git a/lldb/test/python_api/frame/TestFrames.py b/lldb/test/python_api/frame/TestFrames.py
index 0318cee..e09bf1b 100644
--- a/lldb/test/python_api/frame/TestFrames.py
+++ b/lldb/test/python_api/frame/TestFrames.py
@@ -15,12 +15,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_get_arg_vals_for_call_stack_with_dsym(self):
"""Exercise SBFrame.GetVariables() API to get argument vals."""
self.buildDsym()
self.do_get_arg_vals()
@python_api_test
+ @dwarf_test
def test_get_arg_vals_for_call_stack_with_dwarf(self):
"""Exercise SBFrame.GetVariables() API to get argument vals."""
self.buildDwarf()
diff --git a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
index dd4331e..998c3a6 100644
--- a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_stop_at_outer_inline_with_dsym(self):
"""Exercise SBFrame.IsInlined() and SBFrame.GetFunctionName()."""
self.buildDsym()
self.do_stop_at_outer_inline()
@python_api_test
+ @dwarf_test
def test_stop_at_outer_inline_with_dwarf(self):
"""Exercise SBFrame.IsInlined() and SBFrame.GetFunctionName()."""
self.buildDwarf()
diff --git a/lldb/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/python_api/function_symbol/TestDisasmAPI.py
index b3a8bbb..ac7bd3f 100644
--- a/lldb/test/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/test/python_api/function_symbol/TestDisasmAPI.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym(self):
"""Exercise getting SBAddress objects, disassembly, and SBAddress APIs."""
self.buildDsym()
self.disasm_and_address_api()
@python_api_test
+ @dwarf_test
def test_with_dwarf(self):
"""Exercise getting SBAddress objects, disassembly, and SBAddress APIs."""
self.buildDwarf()
diff --git a/lldb/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/python_api/function_symbol/TestSymbolAPI.py
index 85e97d3..5242ff0 100644
--- a/lldb/test/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/test/python_api/function_symbol/TestSymbolAPI.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym(self):
"""Exercise some SBSymbol and SBAddress APIs."""
self.buildDsym()
self.symbol_and_address_api()
@python_api_test
+ @dwarf_test
def test_with_dwarf(self):
"""Exercise some SBSymbol and SBAddress APIs."""
self.buildDwarf()
diff --git a/lldb/test/python_api/hello_world/TestHelloWorld.py b/lldb/test/python_api/hello_world/TestHelloWorld.py
index ef9a63c..d6532aa 100644
--- a/lldb/test/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/test/python_api/hello_world/TestHelloWorld.py
@@ -11,6 +11,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym_and_process_launch_api(self):
"""Create target, breakpoint, launch a process, and then kill it.
@@ -21,6 +22,7 @@
self.hello_world_python()
@python_api_test
+ @dwarf_test
def test_with_dwarf_and_process_launch_api(self):
"""Create target, breakpoint, launch a process, and then kill it.
@@ -32,6 +34,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym_and_attach_to_process_with_id_api(self):
"""Create target, spawn a process, and attach to it with process id.
@@ -42,6 +45,7 @@
self.hello_world_attach_with_id_api()
@python_api_test
+ @dwarf_test
def test_with_dwarf_and_attach_to_process_with_id_api(self):
"""Create target, spawn a process, and attach to it with process id.
@@ -53,6 +57,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym_and_attach_to_process_with_name_api(self):
"""Create target, spawn a process, and attach to it with process name.
@@ -63,6 +68,7 @@
self.hello_world_attach_with_name_api()
@python_api_test
+ @dwarf_test
def test_with_dwarf_and_attach_to_process_with_name_api(self):
"""Create target, spawn a process, and attach to it with process name.
diff --git a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
index 1ab3dc4..c08d038 100644
--- a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
@@ -12,12 +12,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
- def test_with_dsym_and_run_command(self):
+ @dsym_test
+ def test_with_dsym_and_process_launch_api(self):
"""Test the SBCommandInterpreter APIs."""
self.buildDsym()
self.command_interpreter_api()
@python_api_test
+ @dwarf_test
def test_with_dwarf_and_process_launch_api(self):
"""Test the SBCommandInterpreter APIs."""
self.buildDwarf()
diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/test/python_api/process/TestProcessAPI.py
index 35bc0eb..95c964c 100644
--- a/lldb/test/python_api/process/TestProcessAPI.py
+++ b/lldb/test/python_api/process/TestProcessAPI.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_read_memory_with_dsym(self):
"""Test Python SBProcess.ReadMemory() API."""
self.buildDsym()
self.read_memory()
@python_api_test
+ @dwarf_test
def test_read_memory_with_dwarf(self):
"""Test Python SBProcess.ReadMemory() API."""
self.buildDwarf()
@@ -27,12 +29,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_write_memory_with_dsym(self):
"""Test Python SBProcess.WriteMemory() API."""
self.buildDsym()
self.write_memory()
@python_api_test
+ @dwarf_test
def test_write_memory_with_dwarf(self):
"""Test Python SBProcess.WriteMemory() API."""
self.buildDwarf()
@@ -40,12 +44,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_access_my_int_with_dsym(self):
"""Test access 'my_int' using Python SBProcess.GetByteOrder() and other APIs."""
self.buildDsym()
self.access_my_int()
@python_api_test
+ @dwarf_test
def test_access_my_int_with_dwarf(self):
"""Test access 'my_int' using Python SBProcess.GetByteOrder() and other APIs."""
self.buildDwarf()
diff --git a/lldb/test/python_api/process/io/TestProcessIO.py b/lldb/test/python_api/process/io/TestProcessIO.py
index d99632f..4d6a022 100644
--- a/lldb/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/python_api/process/io/TestProcessIO.py
@@ -11,12 +11,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_put_stdin_with_dsym(self):
"""Exercise SBProcess.PutSTDIN()."""
self.buildDsym()
self.put_stdin()
@python_api_test
+ @dwarf_test
def test_put_stdin_with_dwarf(self):
"""Exercise SBProcess.PutSTDIN()."""
self.buildDwarf()
diff --git a/lldb/test/python_api/sbdata/TestSBData.py b/lldb/test/python_api/sbdata/TestSBData.py
index 1b9f901..a93e7bd 100644
--- a/lldb/test/python_api/sbdata/TestSBData.py
+++ b/lldb/test/python_api/sbdata/TestSBData.py
@@ -13,12 +13,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym_and_run_command(self):
"""Test the SBData APIs."""
self.buildDsym()
self.data_api()
@python_api_test
+ @dwarf_test
def test_with_dwarf_and_run_command(self):
"""Test the SBData APIs."""
self.buildDwarf()
diff --git a/lldb/test/python_api/symbol-context/TestSymbolContext.py b/lldb/test/python_api/symbol-context/TestSymbolContext.py
index ad0a55b..cb608d1 100644
--- a/lldb/test/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/test/python_api/symbol-context/TestSymbolContext.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym(self):
"""Exercise SBSymbolContext API extensively."""
self.buildDsym()
self.symbol_context()
@python_api_test
+ @dwarf_test
def test_with_dwarf(self):
"""Exercise SBSymbolContext API extensively."""
self.buildDwarf()
diff --git a/lldb/test/python_api/target/TestTargetAPI.py b/lldb/test/python_api/target/TestTargetAPI.py
index de845cc..355e0f2 100644
--- a/lldb/test/python_api/target/TestTargetAPI.py
+++ b/lldb/test/python_api/target/TestTargetAPI.py
@@ -14,6 +14,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_find_global_variables_with_dsym(self):
"""Exercise SBTaget.FindGlobalVariables() API."""
d = {'EXE': 'a.out'}
@@ -29,6 +30,7 @@
# the inferior process does not exist yet. The radar has been updated.
#@unittest232.skip("segmentation fault -- skipping")
@python_api_test
+ @dwarf_test
def test_find_global_variables_with_dwarf(self):
"""Exercise SBTarget.FindGlobalVariables() API."""
d = {'EXE': 'b.out'}
@@ -38,6 +40,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_find_functions_with_dsym(self):
"""Exercise SBTaget.FindFunctions() API."""
d = {'EXE': 'a.out'}
@@ -46,6 +49,7 @@
self.find_functions('a.out')
@python_api_test
+ @dwarf_test
def test_find_functions_with_dwarf(self):
"""Exercise SBTarget.FindFunctions() API."""
d = {'EXE': 'b.out'}
@@ -55,12 +59,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_get_description_with_dsym(self):
"""Exercise SBTaget.GetDescription() API."""
self.buildDsym()
self.get_description()
@python_api_test
+ @dwarf_test
def test_get_description_with_dwarf(self):
"""Exercise SBTarget.GetDescription() API."""
self.buildDwarf()
@@ -68,12 +74,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_launch_new_process_and_redirect_stdout_with_dsym(self):
"""Exercise SBTaget.Launch() API."""
self.buildDsym()
self.launch_new_process_and_redirect_stdout()
@python_api_test
+ @dwarf_test
def test_launch_new_process_and_redirect_stdout_with_dwarf(self):
"""Exercise SBTarget.Launch() API."""
self.buildDwarf()
@@ -81,12 +89,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_resolve_symbol_context_with_address_with_dsym(self):
"""Exercise SBTaget.ResolveSymbolContextForAddress() API."""
self.buildDsym()
self.resolve_symbol_context_with_address()
@python_api_test
+ @dwarf_test
def test_resolve_symbol_context_with_address_with_dwarf(self):
"""Exercise SBTarget.ResolveSymbolContextForAddress() API."""
self.buildDwarf()
diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/test/python_api/thread/TestThreadAPI.py
index 66cde0c..93bff1d 100644
--- a/lldb/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/python_api/thread/TestThreadAPI.py
@@ -14,12 +14,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_get_process_with_dsym(self):
"""Test Python SBThread.GetProcess() API."""
self.buildDsym()
self.get_process()
@python_api_test
+ @dwarf_test
def test_get_process_with_dwarf(self):
"""Test Python SBThread.GetProcess() API."""
self.buildDwarf()
@@ -27,12 +29,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_get_stop_description_with_dsym(self):
"""Test Python SBThread.GetStopDescription() API."""
self.buildDsym()
self.get_stop_description()
@python_api_test
+ @dwarf_test
def test_get_stop_description_with_dwarf(self):
"""Test Python SBThread.GetStopDescription() API."""
self.buildDwarf()
@@ -40,6 +44,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_run_to_address_with_dsym(self):
"""Test Python SBThread.RunToAddress() API."""
# We build a different executable than the default buildDwarf() does.
@@ -49,6 +54,7 @@
self.run_to_address(self.exe_name)
@python_api_test
+ @dwarf_test
def test_run_to_address_with_dwarf(self):
"""Test Python SBThread.RunToAddress() API."""
# We build a different executable than the default buildDwarf() does.
@@ -59,6 +65,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_step_out_of_malloc_into_function_b_with_dsym(self):
"""Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""
# We build a different executable than the default buildDsym() does.
@@ -68,6 +75,7 @@
self.step_out_of_malloc_into_function_b(self.exe_name)
@python_api_test
+ @dwarf_test
def test_step_out_of_malloc_into_function_b_with_dwarf(self):
"""Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""
# We build a different executable than the default buildDwarf() does.
@@ -78,6 +86,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_step_over_3_times_with_dsym(self):
"""Test Python SBThread.StepOver() API."""
# We build a different executable than the default buildDsym() does.
@@ -87,6 +96,7 @@
self.step_over_3_times(self.exe_name)
@python_api_test
+ @dwarf_test
def test_step_over_3_times_with_dwarf(self):
"""Test Python SBThread.StepOver() API."""
# We build a different executable than the default buildDwarf() does.
diff --git a/lldb/test/python_api/type/TestTypeList.py b/lldb/test/python_api/type/TestTypeList.py
index 6f7e811..05643e67 100644
--- a/lldb/test/python_api/type/TestTypeList.py
+++ b/lldb/test/python_api/type/TestTypeList.py
@@ -14,6 +14,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym(self):
"""Exercise SBType and SBTypeList API."""
d = {'EXE': self.exe_name}
@@ -22,6 +23,7 @@
self.type_and_typelist_api(self.exe_name)
@python_api_test
+ @dwarf_test
def test_with_dwarf(self):
"""Exercise SBType and SBTypeList API."""
d = {'EXE': self.exe_name}
diff --git a/lldb/test/python_api/value/TestValueAPI.py b/lldb/test/python_api/value/TestValueAPI.py
index 9102855..6659a2f 100644
--- a/lldb/test/python_api/value/TestValueAPI.py
+++ b/lldb/test/python_api/value/TestValueAPI.py
@@ -14,6 +14,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym(self):
"""Exercise some SBValue APIs."""
d = {'EXE': self.exe_name}
@@ -22,6 +23,7 @@
self.value_api(self.exe_name)
@python_api_test
+ @dwarf_test
def test_with_dwarf(self):
"""Exercise some SBValue APIs."""
d = {'EXE': self.exe_name}
diff --git a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
index d5ecb16..26f849b 100644
--- a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
@@ -14,6 +14,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_change_value_with_dsym(self):
"""Exercise the SBValue::SetValueFromCString API."""
d = {'EXE': self.exe_name}
@@ -22,6 +23,7 @@
self.change_value_api(self.exe_name)
@python_api_test
+ @dwarf_test
def test_change_value_with_dwarf(self):
"""Exercise the SBValue::SetValueFromCString API."""
d = {'EXE': self.exe_name}
diff --git a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
index 2d820cb..d6da194f 100644
--- a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
@@ -15,6 +15,7 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_with_dsym(self):
"""Exercise SBValue API linked_list_iter."""
d = {'EXE': self.exe_name}
@@ -23,6 +24,7 @@
self.linked_list_api(self.exe_name)
@python_api_test
+ @dwarf_test
def test_with_dwarf(self):
"""Exercise SBValue API linked_list_iter."""
d = {'EXE': self.exe_name}
diff --git a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
index d16d0cb..e283ab0 100644
--- a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
@@ -22,12 +22,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_watch_val_with_dsym(self):
"""Exercise SBValue.Watch() API to set a watchpoint."""
self.buildDsym()
self.do_set_watchpoint()
@python_api_test
+ @dwarf_test
def test_watch_val_with_dwarf(self):
"""Exercise SBValue.Watch() API to set a watchpoint."""
self.buildDwarf()
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
index 53b86bc..2076ea6 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
@@ -22,12 +22,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_set_watch_ignore_count_with_dsym(self):
"""Test SBWatchpoint.SetIgnoreCount() API."""
self.buildDsym()
self.do_watchpoint_ignore_count()
@python_api_test
+ @dwarf_test
def test_set_watch_ignore_count_with_dwarf(self):
"""Test SBWatchpoint.SetIgnoreCount() API."""
self.buildDwarf()
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/python_api/watchpoint/TestWatchpointIter.py
index 2d70648..db6d70f 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/test/python_api/watchpoint/TestWatchpointIter.py
@@ -22,12 +22,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_watch_iter_with_dsym(self):
"""Exercise SBTarget.watchpoint_iter() API to iterate on the available watchpoints."""
self.buildDsym()
self.do_watchpoint_iter()
@python_api_test
+ @dwarf_test
def test_watch_iter_with_dwarf(self):
"""Exercise SBTarget.watchpoint_iter() API to iterate on the available watchpoints."""
self.buildDwarf()
diff --git a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index bfbbc91..8f46670 100644
--- a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -26,12 +26,14 @@
self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name}
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ @dsym_test
def test_watchpoint_cond_api_with_dsym(self):
"""Test watchpoint condition API."""
self.buildDsym(dictionary=self.d)
self.setTearDownCleanup(dictionary=self.d)
self.watchpoint_condition_api()
+ @dwarf_test
def test_watchpoint_cond_api_with_dwarf(self):
"""Test watchpoint condition API."""
self.buildDwarf(dictionary=self.d)
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index cd2b79b..21ac809 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@@ -24,12 +24,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_watch_location_with_dsym(self):
"""Exercise SBValue.WatchPointee() API to set a watchpoint."""
self.buildDsym()
self.do_set_watchlocation()
@python_api_test
+ @dwarf_test
def test_watch_location_with_dwarf(self):
"""Exercise SBValue.WatchPointee() API to set a watchpoint."""
self.buildDwarf()
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index 67fcbd6..34c2dae 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -24,12 +24,14 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@python_api_test
+ @dsym_test
def test_watch_address_with_dsym(self):
"""Exercise SBTarget.WatchAddress() API to set a watchpoint."""
self.buildDsym()
self.do_set_watchaddress()
@python_api_test
+ @dwarf_test
def test_watch_address_with_dwarf(self):
"""Exercise SBTarget.WatchAddress() API to set a watchpoint."""
self.buildDwarf()