diff options
Diffstat (limited to 'lldb/test/functionalities')
124 files changed, 207 insertions, 207 deletions
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py index fbf8171c316..6929d237484 100644 --- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py +++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py @@ -13,7 +13,7 @@ class AbbreviationsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) @expectedFailureFreeBSD("llvm.org/pr22611 thread race condition breaks prompt setting") - @unittest2.skipIf(sys.platform.startswith("win32"), "one-shot script commands deadlock on Windows.") + @skipIfWindows # one-shot script commands deadlock on Windows. def test_nonrunning_command_abbreviations (self): self.expect("ap script", startstr = "The following built-in commands may relate to 'script':", @@ -78,7 +78,7 @@ class AbbreviationsTestCase(TestBase): self.runCmd (r'''sc print "\n\n\tHello!\n"''') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py index ec322db1c2d..f653e08e737 100644 --- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py +++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py @@ -13,7 +13,7 @@ class CommonShortSpellingsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/alias/TestAliases.py b/lldb/test/functionalities/alias/TestAliases.py index b49fe5d7f80..92251e50220 100644 --- a/lldb/test/functionalities/alias/TestAliases.py +++ b/lldb/test/functionalities/alias/TestAliases.py @@ -12,7 +12,7 @@ class AliasTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/asan/TestMemoryHistory.py b/lldb/test/functionalities/asan/TestMemoryHistory.py index c63b70e3cf3..377e453809b 100644 --- a/lldb/test/functionalities/asan/TestMemoryHistory.py +++ b/lldb/test/functionalities/asan/TestMemoryHistory.py @@ -19,7 +19,7 @@ class AsanTestCase(TestBase): @dsym_test @skipIfRemote @skipUnlessCompilerRt - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_with_dsym (self): compiler = self.findBuiltClang () self.buildDsym (None, compiler) diff --git a/lldb/test/functionalities/asan/TestReportData.py b/lldb/test/functionalities/asan/TestReportData.py index 3ec992c0e87..235ba037d69 100644 --- a/lldb/test/functionalities/asan/TestReportData.py +++ b/lldb/test/functionalities/asan/TestReportData.py @@ -20,7 +20,7 @@ class AsanTestReportDataCase(TestBase): @dsym_test @skipIfRemote @skipUnlessCompilerRt - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_with_dsym (self): compiler = self.findBuiltClang () self.buildDsym (None, compiler) diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py index 3a3156bf203..79696780287 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -18,7 +18,7 @@ class BreakpointCommandTestCase(TestBase): cls.RemoveTempFile("output.txt") cls.RemoveTempFile("output2.txt") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test a sequence of breakpoint command add, list, and delete.""" diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py index 164b42a2ab4..7fab045bfe5 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py @@ -14,7 +14,7 @@ class PythonBreakpointCommandSettingTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) my_var = 10 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_out_with_dsym_python(self): diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py index 055ca4cf2a1..ca95f36e838 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py @@ -12,7 +12,7 @@ class RegexpBreakCommandTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test _regexp-break command.""" diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py index ad8c295be3b..7a6a2c158d5 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py @@ -12,21 +12,21 @@ class BreakpointConditionsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_breakpoint_condition_with_dsym_and_run_command(self): """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'.""" self.buildDsym() self.breakpoint_conditions() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_breakpoint_condition_inline_with_dsym_and_run_command(self): """Exercise breakpoint condition inline with 'breakpoint set'.""" self.buildDsym() self.breakpoint_conditions(inline=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_breakpoint_condition_with_dsym_and_python_api(self): @@ -35,14 +35,14 @@ class BreakpointConditionsTestCase(TestBase): self.breakpoint_conditions_python() @dwarf_test - @unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)") + @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232) def test_breakpoint_condition_with_dwarf_and_run_command(self): """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'.""" self.buildDwarf() self.breakpoint_conditions() @dwarf_test - @unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)") + @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232) def test_breakpoint_condition_inline_with_dwarf_and_run_command(self): """Exercise breakpoint condition inline with 'breakpoint set'.""" self.buildDwarf() @@ -50,7 +50,7 @@ class BreakpointConditionsTestCase(TestBase): @python_api_test @dwarf_test - @unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)") + @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232) def test_breakpoint_condition_with_dwarf_and_python_api(self): """Use Python APIs to set breakpoint conditions.""" self.buildDwarf() diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py index 89d90362eab..23d7e8a8884 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py @@ -12,7 +12,7 @@ class BreakpointIDTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py index 506ac167f4d..7655af396ab 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py @@ -12,14 +12,14 @@ class BreakpointIgnoreCountTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Exercise breakpoint ignore count with 'breakpoint set -i <count>'.""" self.buildDsym() self.breakpoint_ignore_count() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py index 79c6a4ccdce..7cf4e8129d6 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py @@ -12,7 +12,7 @@ class BreakpointLocationsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test breakpoint enable/disable for a breakpoint ID with multiple locations.""" diff --git a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py index d3b2331412b..c85758df97a 100644 --- a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py @@ -12,7 +12,7 @@ class TestCPPBreakpoints(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py index 9324a59f776..1802dceca62 100644 --- a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py +++ b/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py @@ -14,7 +14,7 @@ class TestCPPExceptionBreakpoint (TestBase): mydir = TestBase.compute_mydir(__file__) my_var = 10 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_cpp_exception_breakpoint (self): diff --git a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py index f694b1df9e7..c162857b392 100644 --- a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py +++ b/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py @@ -12,7 +12,7 @@ class BreakpointInDummyTarget (TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test breakpoint set before we have a target. """ diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py index 8c8a92865fd..ec5e2f3e696 100644 --- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py @@ -14,7 +14,7 @@ class InlinedBreakpointsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp).""" diff --git a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py index 0b48b48d311..1c823799138 100644 --- a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py @@ -11,7 +11,7 @@ import lldbutil import shutil import subprocess -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class TestObjCBreakpoints(TestBase): mydir = TestBase.compute_mydir(__file__) diff --git a/lldb/test/functionalities/command_script/TestCommandScript.py b/lldb/test/functionalities/command_script/TestCommandScript.py index b7e466d2403..fab1cb2b683 100644 --- a/lldb/test/functionalities/command_script/TestCommandScript.py +++ b/lldb/test/functionalities/command_script/TestCommandScript.py @@ -11,7 +11,7 @@ class CmdPythonTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py index 200faa0f6ec..1031bfd766c 100644 --- a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py +++ b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py @@ -17,7 +17,7 @@ class ConditionalBreakTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_python(self): @@ -32,7 +32,7 @@ class ConditionalBreakTestCase(TestBase): self.buildDwarf() self.do_conditional_break() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_command(self): """Simulate a user using lldb commands to break on c() if called from a().""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py index 694ced9fc4b..702563a20ae 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py @@ -12,7 +12,7 @@ class AdvDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py index 5edefd0b000..76de9a7245e 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py @@ -12,7 +12,7 @@ class CategoriesDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py index 2d6f888339b..8ffbb73a6e8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py @@ -12,7 +12,7 @@ class CppDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py index 107f93d040b..64979bb5179 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py @@ -12,7 +12,7 @@ class DataFormatterDisablingTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py index 69e477dfc16..98891e539c2 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py @@ -12,7 +12,7 @@ class EnumFormatTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py index b8feee71b24..0b5817fccbe 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py @@ -12,7 +12,7 @@ class GlobalsDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py index 3564f6b3f4d..64e68e5e320 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py @@ -12,7 +12,7 @@ class NamedSummariesDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py index 14b3932978b..f0aadb59ba1 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -14,14 +14,14 @@ class ObjCDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_plain_objc_with_dsym_and_run_command(self): """Test basic ObjC formatting behavior.""" self.buildDsym() self.plain_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_plain_objc_with_dwarf_and_run_command(self): """Test basic ObjC formatting behavior.""" @@ -33,186 +33,186 @@ class ObjCDataFormatterTestCase(TestBase): self.appkit_common_data_formatters_command() commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsnumber_with_dsym_and_run_command(self): """Test formatters for NSNumber.""" self.appkit_tester_impl(self.buildDsym,self.nsnumber_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsnumber_with_dwarf_and_run_command(self): """Test formatters for NSNumber.""" self.appkit_tester_impl(self.buildDwarf,self.nsnumber_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsstring_with_dsym_and_run_command(self): """Test formatters for NSString.""" self.appkit_tester_impl(self.buildDsym,self.nsstring_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsstring_with_dwarf_and_run_command(self): """Test formatters for NSString.""" self.appkit_tester_impl(self.buildDwarf,self.nsstring_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nscontainers_with_dsym_and_run_command(self): """Test formatters for NS container classes.""" self.appkit_tester_impl(self.buildDsym,self.nscontainers_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nscontainers_with_dwarf_and_run_command(self): """Test formatters for NS container classes.""" self.appkit_tester_impl(self.buildDwarf,self.nscontainers_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsdata_with_dsym_and_run_command(self): """Test formatters for NSData.""" self.appkit_tester_impl(self.buildDsym,self.nsdata_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsdata_with_dwarf_and_run_command(self): """Test formatters for NSData.""" self.appkit_tester_impl(self.buildDwarf,self.nsdata_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsurl_with_dsym_and_run_command(self): """Test formatters for NSURL.""" self.appkit_tester_impl(self.buildDsym,self.nsurl_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsurl_with_dwarf_and_run_command(self): """Test formatters for NSURL.""" self.appkit_tester_impl(self.buildDwarf,self.nsurl_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nserror_with_dsym_and_run_command(self): """Test formatters for NSError.""" self.appkit_tester_impl(self.buildDsym,self.nserror_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nserror_with_dwarf_and_run_command(self): """Test formatters for NSError.""" self.appkit_tester_impl(self.buildDwarf,self.nserror_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsbundle_with_dsym_and_run_command(self): """Test formatters for NSBundle.""" self.appkit_tester_impl(self.buildDsym,self.nsbundle_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsbundle_with_dwarf_and_run_command(self): """Test formatters for NSBundle.""" self.appkit_tester_impl(self.buildDwarf,self.nsbundle_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsexception_with_dsym_and_run_command(self): """Test formatters for NSException.""" self.appkit_tester_impl(self.buildDsym,self.nsexception_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsexception_with_dwarf_and_run_command(self): """Test formatters for NSException.""" self.appkit_tester_impl(self.buildDwarf,self.nsexception_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsmisc_with_dsym_and_run_command(self): """Test formatters for misc NS classes.""" self.appkit_tester_impl(self.buildDsym,self.nsmisc_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsmisc_with_dwarf_and_run_command(self): """Test formatters for misc NS classes.""" self.appkit_tester_impl(self.buildDwarf,self.nsmisc_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_nsdate_with_dsym_and_run_command(self): """Test formatters for NSDate.""" self.appkit_tester_impl(self.buildDsym,self.nsdate_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_nsdate_with_dwarf_and_run_command(self): """Test formatters for NSDate.""" self.appkit_tester_impl(self.buildDwarf,self.nsdate_data_formatter_commands) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_coreframeworks_with_dsym_and_run_command(self): """Test formatters for Core OSX frameworks.""" self.buildDsym() self.cf_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_coreframeworks_with_dwarf_and_run_command(self): """Test formatters for Core OSX frameworks.""" self.buildDwarf() self.cf_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_kvo_with_dsym_and_run_command(self): """Test the behavior of formatters when KVO is in use.""" self.buildDsym() self.kvo_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_kvo_with_dwarf_and_run_command(self): """Test the behavior of formatters when KVO is in use.""" self.buildDwarf() self.kvo_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rdar11106605_with_dsym_and_run_command(self): """Check that Unicode characters come out of CFString summary correctly.""" self.buildDsym() self.rdar11106605_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_rdar11106605_with_dwarf_and_run_command(self): """Check that Unicode characters come out of CFString summary correctly.""" self.buildDwarf() self.rdar11106605_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr_with_dsym_and_run_command(self): """Test common cases of expression parser <--> formatters interaction.""" self.buildDsym() self.expr_objc_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_expr_with_dwarf_and_run_command(self): """Test common cases of expression parser <--> formatters interaction.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py index aace8a084be..fad6d4a05b1 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py @@ -12,7 +12,7 @@ class PythonSynthDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" @@ -26,7 +26,7 @@ class PythonSynthDataFormatterTestCase(TestBase): self.buildDwarf() self.data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rdar10960550_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py index 213951385e0..a23fa2c9adc 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py @@ -12,7 +12,7 @@ class ScriptDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py index 05d0365aec8..6a925dbb2c0 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -12,7 +12,7 @@ class SkipSummaryDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py index a6c5ce95fbe..645d316e5a5 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py @@ -12,7 +12,7 @@ class SmartArrayDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py index 618681c1c01..c577930cd72 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py @@ -12,7 +12,7 @@ class LibcxxIteratorDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py index 9b3dd02d365..54bb9961f87 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py @@ -12,7 +12,7 @@ class LibcxxListDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py index 4807cb926d8..3c8c38a1081 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py @@ -12,7 +12,7 @@ class LibcxxMapDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py index 39d948cd731..7054fd78d18 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py @@ -12,7 +12,7 @@ class LibcxxMultiMapDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py index ff8bd90231f..ccbefe98f41 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py @@ -12,7 +12,7 @@ class LibcxxMultiSetDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py index 045eb70cfe5..be64ec82202 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py @@ -12,7 +12,7 @@ class LibcxxSetDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py index cfa7cb1b5f4..a0463e0b1f5 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -13,7 +13,7 @@ class LibcxxStringDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py index ac03705d105..7f2a7dd42da 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py @@ -12,7 +12,7 @@ class LibcxxMultiMapDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py index aad75d46dcd..8dba1ff401c 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py @@ -12,7 +12,7 @@ class LibcxxVBoolDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py index 84c2cf8bc8d..edd5b02a898 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py @@ -12,7 +12,7 @@ class LibcxxVectorDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py index 05ae523232a..bac3057309f 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py @@ -12,7 +12,7 @@ class StdIteratorDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py index 2f7b763a534..6b06581112a 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py @@ -12,7 +12,7 @@ class StdListDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py index c7cc5ae2146..d2ffa0f4b36 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py @@ -12,7 +12,7 @@ class StdMapDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py index fa8b1931d27..9188efb8d55 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -13,7 +13,7 @@ class StdStringDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py index 314b5b9a17a..7fc8a7c817c 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py @@ -12,7 +12,7 @@ class StdVBoolDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @skipIfDarwin def test_with_dsym_and_run_command(self): diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py index 698ceabb383..9d4ea773eb7 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py @@ -12,7 +12,7 @@ class StdVectorDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py index a6aad2e2880..f6aeaa9de4d 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py @@ -12,7 +12,7 @@ class SynthDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py index 88b1db21888..f481942248f 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py @@ -12,7 +12,7 @@ class DataFormatterSynthValueTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test using Python synthetic children provider to provide a value.""" diff --git a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py index b8a7ba3a438..cc670569d72 100644 --- a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py +++ b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py @@ -13,7 +13,7 @@ class FormatPropagationTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) # rdar://problem/14035604 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Check if changing Format on an SBValue correctly propagates that new format to children as it should""" diff --git a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py index 02b18d86c0c..7580a5f86b7 100644 --- a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py +++ b/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py @@ -12,7 +12,7 @@ class FrameFormatSmallStructTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that the user can input a format but it will not prevail over summary format's choices.""" diff --git a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py index 0fe21a8ae89..ad086e6e1a9 100644 --- a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py +++ b/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py @@ -12,7 +12,7 @@ class PtrRef2TypedefTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py b/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py index 9ec5cb50530..ac8757f6cfe 100644 --- a/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py +++ b/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py @@ -13,7 +13,7 @@ class Radar10449092DataFormatterTestCase(TestBase): # test for rdar://problem/10449092 () mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py b/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py index 0a21af8b223..b4f6294c11a 100644 --- a/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py +++ b/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py @@ -13,14 +13,14 @@ class Radar10642615DataFormatterTestCase(TestBase): # test for rdar://problem/10642615 () mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" self.buildDsym() self.data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py b/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py index a662f142104..67aa08de6b8 100644 --- a/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py +++ b/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py @@ -13,7 +13,7 @@ class Rdar10887661TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) # rdar://problem/10887661 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Check for an issue where capping does not work because the Target pointer appears to be changing behind our backs.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py b/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py index 3f6dc27b634..40bd599617f 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py +++ b/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py @@ -13,14 +13,14 @@ class DataFormatterRdar11086338TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rdar11086338_with_dsym_and_run_command(self): """Test that NSArray reports its synthetic children properly.""" self.buildDsym() self.rdar11086338_tester() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_rdar11086338_with_dwarf_and_run_command(self): """Test that NSArray reports its synthetic children properly.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py index a3b90823473..f0584c89ed2 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py +++ b/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py @@ -13,14 +13,14 @@ class DataFormatterOSTypeTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_ostype_with_dsym_and_run_command(self): """Test the formatters we use for OSType.""" self.buildDsym() self.ostype_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_ostype_with_dwarf_and_run_command(self): """Test the formatters we use for OSType.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py index 99e6953b6ba..092737b3ac2 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py +++ b/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py @@ -13,14 +13,14 @@ class DataFormatterBoolRefPtr(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_boolrefptr_with_dsym_and_run_command(self): """Test the formatters we use for BOOL& and BOOL* in Objective-C.""" self.buildDsym() self.boolrefptr_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_boolrefptr_with_dwarf_and_run_command(self): """Test the formatters we use for BOOL& and BOOL* in Objective-C.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py b/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py index 4a8829f2079..ae1b83bd39b 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py +++ b/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py @@ -13,14 +13,14 @@ class DataFormatterRdar11988289TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rdar11988289_with_dsym_and_run_command(self): """Test that NSDictionary reports its synthetic children properly.""" self.buildDsym() self.rdar11988289_tester() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_rdar11988289_with_dwarf_and_run_command(self): """Test that NSDictionary reports its synthetic children properly.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py b/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py index e08fcb2d06e..c96f38b0803 100644 --- a/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py +++ b/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py @@ -13,14 +13,14 @@ class DataFormatterRdar12437442TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rdar12437442_with_dsym_and_run_command(self): """Test that we update SBValues correctly as dynamic types change.""" self.buildDsym() self.rdar12437442_tester() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_rdar12437442_with_dwarf_and_run_command(self): """Test that we update SBValues correctly as dynamic types change.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py b/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py index 326c5d60c29..83a36ecda55 100644 --- a/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py +++ b/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py @@ -13,14 +13,14 @@ class DataFormatterRdar12529957TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rdar12529957_with_dsym_and_run_command(self): """Test that NSSet reports its synthetic children properly.""" self.buildDsym() self.rdar12529957_tester() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_rdar12529957_with_dwarf_and_run_command(self): """Test that NSSet reports its synthetic children properly.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py b/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py index cc936ba03bb..5a2acda18a3 100644 --- a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py +++ b/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py @@ -13,7 +13,7 @@ class Radar13338477DataFormatterTestCase(TestBase): # test for rdar://problem/13338477 () mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that LLDB handles the clang typeclass Paren correctly.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py b/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py index 42026ef9f2b..b3cbeb43e10 100644 --- a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py +++ b/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py @@ -13,14 +13,14 @@ class DataFormatterOneIsSingularTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_one_is_singular_with_dsym_and_run_command(self): """Test that 1 item is not as reported as 1 items.""" self.buildDsym() self.oneness_data_formatter_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_one_is_singular_with_dwarf_and_run_command(self): """Test that 1 item is not as reported as 1 items.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py index aa9772b69ef..9470fbf2393 100644 --- a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py +++ b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py @@ -13,7 +13,7 @@ class Radar9973865DataFormatterTestCase(TestBase): # test for rdar://problem/9973865 (If you use "${var}" in the summary string for an aggregate type, the summary doesn't print for a pointer to that type) mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py b/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py index 81bc93cade5..5f31904279c 100644 --- a/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py +++ b/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py @@ -13,7 +13,7 @@ class Radar9973992DataFormatterTestCase(TestBase): # test for rdar://problem/9973992 (What should we do for "${var}" in summaries of aggregate types?) mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py b/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py index ee77e5b4f5d..087f3805909 100644 --- a/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py +++ b/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py @@ -13,7 +13,7 @@ class Radar9974002DataFormatterTestCase(TestBase): # test for rdar://problem/9974002 () mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py index e1b195570d0..237099d7bdd 100644 --- a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py +++ b/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py @@ -12,7 +12,7 @@ class DataFormatterRefPtrRecursionTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that ValueObjectPrinter does not cause an infinite loop when a reference to a struct that contains a pointer to itself is printed.""" diff --git a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py index eb6aeb50c45..7650c23bb51 100644 --- a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py +++ b/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py @@ -12,7 +12,7 @@ class UserFormatVSSummaryTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that the user can input a format but it will not prevail over summary format's choices.""" diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py index 01bf12267ef..66f597d3493 100644 --- a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py +++ b/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py @@ -13,7 +13,7 @@ class PythonSynthDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test data formatter commands.""" diff --git a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py index 41a24834f88..a006875ec96 100644 --- a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py +++ b/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py @@ -13,7 +13,7 @@ class VectorTypesFormattingTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) # rdar://problem/14035604 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Check that vector types format properly""" diff --git a/lldb/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/functionalities/dead-strip/TestDeadStrip.py index 1371953b32f..1f163e9a80c 100644 --- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py +++ b/lldb/test/functionalities/dead-strip/TestDeadStrip.py @@ -12,7 +12,7 @@ class DeadStripTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test breakpoint works correctly with dead-code stripping.""" diff --git a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py index 9324592a158..b6c64fce1fe 100644 --- a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py +++ b/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py @@ -12,7 +12,7 @@ class DisassemblyTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () diff --git a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py index f96ab621c70..6973db16adc 100644 --- a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py +++ b/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py @@ -12,7 +12,7 @@ class DynamicValueChildCountTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test @expectedFailurei386("to be figured out") diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py index a997fbda5ee..afd676acb31 100644 --- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py +++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py @@ -9,7 +9,7 @@ class ConvenienceVariablesCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @skipIfRemote def test_with_dsym_and_run_command(self): diff --git a/lldb/test/functionalities/exec/TestExec.py b/lldb/test/functionalities/exec/TestExec.py index 3501fd22f06..e5d19583ee3 100644 --- a/lldb/test/functionalities/exec/TestExec.py +++ b/lldb/test/functionalities/exec/TestExec.py @@ -22,7 +22,7 @@ class ExecTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): if self.getArchitecture() == 'x86_64': @@ -35,7 +35,7 @@ class ExecTestCase(TestBase): self.do_test () - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf (self): if self.getArchitecture() == 'x86_64': diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py index 969b1c68f3a..d9e736baf21 100644 --- a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py +++ b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py @@ -15,7 +15,7 @@ class ExprDoesntDeadlockTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that expr will time out and allow other threads to run if it blocks - with dsym.""" diff --git a/lldb/test/functionalities/fat_archives/TestFatArchives.py b/lldb/test/functionalities/fat_archives/TestFatArchives.py index a878cc4c5d9..dc31738df2b 100644 --- a/lldb/test/functionalities/fat_archives/TestFatArchives.py +++ b/lldb/test/functionalities/fat_archives/TestFatArchives.py @@ -21,7 +21,7 @@ class FatArchiveTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf (self): if self.getArchitecture() == 'x86_64': diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py index 5fe235cc795..3e4aae746a3 100644 --- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py +++ b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py @@ -9,7 +9,7 @@ class AssertingInferiorTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @unittest2.expectedFailure("rdar://15367233") def test_inferior_asserting_dsym(self): """Test that lldb reliably catches the inferior asserting (command).""" @@ -24,7 +24,7 @@ class AssertingInferiorTestCase(TestBase): self.buildDwarf() self.inferior_asserting() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_asserting_registers_dsym(self): """Test that lldb reliably reads registers from the inferior after asserting (command).""" self.buildDsym() @@ -52,7 +52,7 @@ class AssertingInferiorTestCase(TestBase): self.buildDefault() self.inferior_asserting_python() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @unittest2.expectedFailure("rdar://15367233") def test_inferior_asserting_expr_dsym(self): """Test that the lldb expression interpreter can read from the inferior after asserting (command).""" @@ -67,7 +67,7 @@ class AssertingInferiorTestCase(TestBase): self.buildDwarf() self.inferior_asserting_expr() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @unittest2.expectedFailure("rdar://15367233") def test_inferior_asserting_step_dsym(self): """Test that lldb functions correctly after stepping through a call to assert().""" diff --git a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py index ef078fbeb9e..4e810c085bc 100644 --- a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py +++ b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py @@ -10,7 +10,7 @@ class ChangedInferiorTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_dsym(self): """Test lldb reloads the inferior after it was changed during the session.""" self.buildDsym() diff --git a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py index 440b8959f21..7ce51de72f1 100644 --- a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -9,7 +9,7 @@ class CrashingInferiorTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_dsym(self): """Test that lldb reliably catches the inferior crashing (command).""" self.buildDsym() @@ -20,7 +20,7 @@ class CrashingInferiorTestCase(TestBase): self.buildDwarf() self.inferior_crashing() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_registers_dsym(self): """Test that lldb reliably reads registers from the inferior after crashing (command).""" self.buildDsym() @@ -37,7 +37,7 @@ class CrashingInferiorTestCase(TestBase): self.buildDefault() self.inferior_crashing_python() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_expr_dsym(self): """Test that the lldb expression interpreter can read from the inferior after crashing (command).""" self.buildDsym() @@ -48,7 +48,7 @@ class CrashingInferiorTestCase(TestBase): self.buildDwarf() self.inferior_crashing_expr() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_step_dsym(self): """Test that lldb functions correctly after stepping through a crash.""" self.buildDsym() @@ -59,7 +59,7 @@ class CrashingInferiorTestCase(TestBase): self.buildDwarf() self.inferior_crashing_step() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_step_after_break_dsym(self): """Test that stepping after a crash behaves correctly.""" self.buildDsym() @@ -72,7 +72,7 @@ class CrashingInferiorTestCase(TestBase): self.buildDwarf() self.inferior_crashing_step_after_break() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_inferior_crashing_expr_step_and_expr_dsym(self): """Test that lldb expressions work before and after stepping after a crash.""" self.buildDsym() diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py index d10eab81281..e5b2ee8839e 100644 --- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -10,7 +10,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_recursive_inferior_crashing_dsym(self): """Test that lldb reliably catches the inferior crashing (command).""" self.buildDsym() @@ -21,7 +21,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): self.buildDwarf() self.recursive_inferior_crashing() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_recursive_inferior_crashing_registers_dsym(self): """Test that lldb reliably reads registers from the inferior after crashing (command).""" self.buildDsym() @@ -38,7 +38,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): self.buildDefault() self.recursive_inferior_crashing_python() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_recursive_inferior_crashing_expr_dsym(self): """Test that the lldb expression interpreter can read from the inferior after crashing (command).""" self.buildDsym() @@ -49,7 +49,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): self.buildDwarf() self.recursive_inferior_crashing_expr() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_recursive_inferior_crashing_step_dsym(self): """Test that lldb functions correctly after stepping through a crash.""" self.buildDsym() @@ -60,7 +60,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): self.buildDwarf() self.recursive_inferior_crashing_step() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_recursive_inferior_crashing_step_after_break_dsym(self): """Test that stepping after a crash behaves correctly.""" self.buildDsym() @@ -73,7 +73,7 @@ class CrashingRecursiveInferiorTestCase(TestBase): self.buildDwarf() self.recursive_inferior_crashing_step_after_break() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_recursive_inferior_crashing_expr_step_and_expr_dsym(self): """Test that lldb expressions work before and after stepping after a crash.""" self.buildDsym() diff --git a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py index e28aefbc532..4a93dab4fa7 100644 --- a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py +++ b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py @@ -10,7 +10,7 @@ class TestInlineStepping(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): @@ -27,7 +27,7 @@ class TestInlineStepping(TestBase): self.buildDwarf() self.inline_stepping() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_over_with_dsym_and_python_api(self): diff --git a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py index 784b5726058..6ef60e21af4 100644 --- a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py +++ b/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py @@ -14,7 +14,7 @@ class LaunchWithShellExpandTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym() diff --git a/lldb/test/functionalities/memory/read/TestMemoryRead.py b/lldb/test/functionalities/memory/read/TestMemoryRead.py index a9fe6c27965..4dab7140f56 100644 --- a/lldb/test/functionalities/memory/read/TestMemoryRead.py +++ b/lldb/test/functionalities/memory/read/TestMemoryRead.py @@ -13,7 +13,7 @@ class MemoryReadTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_memory_read_with_dsym(self): """Test the 'memory read' command with plain and vector formats.""" diff --git a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py index bba3ab632bc..06eb0dc9db2 100644 --- a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py +++ b/lldb/test/functionalities/nosucharch/TestNoSuchArch.py @@ -11,14 +11,14 @@ class NoSuchArchTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym() self.do_test () - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf (self): self.buildDwarf() diff --git a/lldb/test/functionalities/paths/TestPaths.py b/lldb/test/functionalities/paths/TestPaths.py index a211145d57f..bc549a64bf8 100644 --- a/lldb/test/functionalities/paths/TestPaths.py +++ b/lldb/test/functionalities/paths/TestPaths.py @@ -34,7 +34,7 @@ class TestPaths(TestBase): # file path if it doesn't exist in the current directory. self.assertTrue (file_only.GetDirectory() == None) - @unittest2.skipUnless(sys.platform.startswith("win32"), "Test for windows only") + @skipUnlessPlatform(["windows"]) def test_windows_double_slash (self): '''Test to check the path with double slash is handled correctly ''' # Create a path and see if lldb gets the directory and file right diff --git a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py index 48a82e6dc0c..fe0b4a21bf3 100644 --- a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py +++ b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py @@ -13,7 +13,7 @@ class PluginPythonOSPlugin(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_python_os_plugin_dsym(self): """Test that the Python operating system plugin works correctly""" diff --git a/lldb/test/functionalities/process_attach/TestProcessAttach.py b/lldb/test/functionalities/process_attach/TestProcessAttach.py index 27f6cb063f2..56a94392e8d 100644 --- a/lldb/test/functionalities/process_attach/TestProcessAttach.py +++ b/lldb/test/functionalities/process_attach/TestProcessAttach.py @@ -14,7 +14,7 @@ class ProcessAttachTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_attach_to_process_by_id_with_dsym(self): """Test attach by process id""" @@ -27,7 +27,7 @@ class ProcessAttachTestCase(TestBase): self.buildDwarf() self.process_attach_by_id() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_attach_to_process_by_name_with_dsym(self): """Test attach by process name""" diff --git a/lldb/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/test/functionalities/process_launch/TestProcessLaunch.py index 164c0c70eea..d8c87a63c72 100644 --- a/lldb/test/functionalities/process_launch/TestProcessLaunch.py +++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py @@ -18,7 +18,7 @@ class ProcessLaunchTestCase(TestBase): self.runCmd("settings set auto-confirm true") self.addTearDownHook(lambda: self.runCmd("settings clear auto-confirm")) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_io_with_dsym (self): """Test that process launch I/O redirection flags work properly.""" @@ -117,7 +117,7 @@ class ProcessLaunchTestCase(TestBase): d = {'CXX_SOURCES' : 'print_cwd.cpp'} - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @expectedFailureDarwin("llvm.org/pr20265") def test_set_working_dir_with_dsym (self): diff --git a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py index e20ee9bd5b6..42724d58894 100644 --- a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py +++ b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py @@ -12,7 +12,7 @@ class ValueObjectRecursionTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that deeply nested ValueObjects still work.""" diff --git a/lldb/test/functionalities/rerun/TestRerun.py b/lldb/test/functionalities/rerun/TestRerun.py index 469f04c59ca..18b447cc563 100644 --- a/lldb/test/functionalities/rerun/TestRerun.py +++ b/lldb/test/functionalities/rerun/TestRerun.py @@ -14,7 +14,7 @@ class TestRerun(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym() diff --git a/lldb/test/functionalities/return-value/TestReturnValue.py b/lldb/test/functionalities/return-value/TestReturnValue.py index 6fe9781ff7f..8791b88ae6b 100644 --- a/lldb/test/functionalities/return-value/TestReturnValue.py +++ b/lldb/test/functionalities/return-value/TestReturnValue.py @@ -12,7 +12,7 @@ class ReturnValueTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailurei386 @python_api_test @dsym_test diff --git a/lldb/test/functionalities/set-data/TestSetData.py b/lldb/test/functionalities/set-data/TestSetData.py index d94d3e870db..07fdc7e0d68 100644 --- a/lldb/test/functionalities/set-data/TestSetData.py +++ b/lldb/test/functionalities/set-data/TestSetData.py @@ -8,7 +8,7 @@ import lldb from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class SetDataTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) diff --git a/lldb/test/functionalities/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py index 4dac5e9000d..008a1ee05fd 100644 --- a/lldb/test/functionalities/signal/TestSendSignal.py +++ b/lldb/test/functionalities/signal/TestSendSignal.py @@ -10,7 +10,7 @@ class SendSignalTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that lldb command 'process signal SIGUSR1' sends a signal to the inferior process.""" diff --git a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py index f6c6a275c94..3b86f3b55c5 100644 --- a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py +++ b/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py @@ -13,7 +13,7 @@ class ReturnValueTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_out_with_dsym_python(self): @@ -30,7 +30,7 @@ class ReturnValueTestCase(TestBase): self.get_to_starting_point() self.do_step_out_past_nodebug() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_over_with_dsym_python(self): @@ -48,7 +48,7 @@ class ReturnValueTestCase(TestBase): self.get_to_starting_point() self.do_step_over_past_nodebug() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_in_with_dsym_python(self): diff --git a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py index 0605dee7af4..8453cc340a2 100644 --- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py +++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py @@ -18,7 +18,7 @@ class StopHookCmdTestCase(TestBase): """target stop-hook list should not crash if no target has been set.""" self.runCmd("target stop-hook list", check=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test a sequence of target stop-hook commands.""" diff --git a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py index c871c15ee19..be7d5fb0b38 100644 --- a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py +++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py @@ -11,7 +11,7 @@ class StopHookMechanismTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test the stop-hook mechanism.""" diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py index 60fd77db5e3..45151cd2a06 100644 --- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py +++ b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py @@ -11,7 +11,7 @@ class StopHookForMultipleThreadsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_stop_hook_multiple_threads_with_dsym(self): """Test that lldb stop-hook works for multiple threads.""" diff --git a/lldb/test/functionalities/target_command/TestTargetCommand.py b/lldb/test/functionalities/target_command/TestTargetCommand.py index 694f7e155e5..8cf327ae32b 100644 --- a/lldb/test/functionalities/target_command/TestTargetCommand.py +++ b/lldb/test/functionalities/target_command/TestTargetCommand.py @@ -38,7 +38,7 @@ class targetCommandTestCase(TestBase): # rdar://problem/9763907 # 'target variable' command fails if the target program has been run - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_target_variable_command_with_dsym(self): """Test 'target variable' command before and after starting the inferior.""" @@ -48,7 +48,7 @@ class targetCommandTestCase(TestBase): self.do_target_variable_command('globals') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_target_variable_command_with_dsym_no_fail(self): """Test 'target variable' command before and after starting the inferior.""" diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/test/functionalities/thread/TestNumThreads.py index de012749a00..d2156399d61 100644 --- a/lldb/test/functionalities/thread/TestNumThreads.py +++ b/lldb/test/functionalities/thread/TestNumThreads.py @@ -12,7 +12,7 @@ class NumberOfThreadsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test number of threads.""" diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py index a5e578a4510..c230c1aad7c 100644 --- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -12,7 +12,7 @@ class BreakpointAfterJoinTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_with_dsym(self): diff --git a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py index 60ecd8c3621..43889aee58a 100644 --- a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py +++ b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py @@ -12,7 +12,7 @@ class CreateAfterAttachTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_create_after_attach_with_dsym(self): """Test thread creation after process attach.""" diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py index 6acd64339cf..1a50c0739ef 100644 --- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py +++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py @@ -12,7 +12,7 @@ class CreateDuringStepTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_step_inst_with_dsym(self): @@ -20,7 +20,7 @@ class CreateDuringStepTestCase(TestBase): self.buildDsym(dictionary=self.getBuildFlags()) self.create_during_step_inst_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_step_over_with_dsym(self): @@ -28,7 +28,7 @@ class CreateDuringStepTestCase(TestBase): self.buildDsym(dictionary=self.getBuildFlags()) self.create_during_step_over_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_step_in_with_dsym(self): diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py index 378ad28acc5..539e7a0dbd2 100644 --- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -12,7 +12,7 @@ class ExitDuringBreakpointTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_with_dsym(self): diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py index 1c8e304131b..837d1a150d0 100644 --- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -12,7 +12,7 @@ class ExitDuringStepTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_thread_state_is_stopped_with_dsym(self): @@ -29,21 +29,21 @@ class ExitDuringStepTestCase(TestBase): self.buildDwarf(dictionary=self.getBuildFlags()) self.thread_state_is_stopped() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @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() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @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() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_step_in_with_dsym(self): """Test thread exit during step-in handling.""" diff --git a/lldb/test/functionalities/thread/jump/TestThreadJump.py b/lldb/test/functionalities/thread/jump/TestThreadJump.py index f2122be9126..d1c279fd7d2 100644 --- a/lldb/test/functionalities/thread/jump/TestThreadJump.py +++ b/lldb/test/functionalities/thread/jump/TestThreadJump.py @@ -12,7 +12,7 @@ class ThreadJumpTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test thread jump handling.""" diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py index 52cb19685d3..b0358e6b457 100644 --- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py +++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py @@ -12,7 +12,7 @@ class MultipleBreakpointTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_with_dsym(self): diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/functionalities/thread/state/TestThreadStates.py index b61d9fb7d64..59db6037bcf 100644 --- a/lldb/test/functionalities/thread/state/TestThreadStates.py +++ b/lldb/test/functionalities/thread/state/TestThreadStates.py @@ -12,7 +12,7 @@ class ThreadStateTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @expectedFailureDarwin("rdar://15367566") def test_state_after_breakpoint_with_dsym(self): @@ -29,7 +29,7 @@ class ThreadStateTestCase(TestBase): self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False)) self.thread_state_after_breakpoint_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_state_after_continue_with_dsym(self): """Test thread state after continue.""" @@ -42,7 +42,7 @@ class ThreadStateTestCase(TestBase): self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False)) self.thread_state_after_continue_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_state_after_expression_with_dsym(self): """Test thread state after expression.""" @@ -55,7 +55,7 @@ class ThreadStateTestCase(TestBase): self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False)) self.thread_state_after_continue_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @unittest2.expectedFailure("llvm.org/pr16172") # thread states not properly maintained def test_process_interrupt_with_dsym(self): @@ -70,7 +70,7 @@ class ThreadStateTestCase(TestBase): self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False)) self.process_interrupt_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @unittest2.expectedFailure("llvm.org/pr15824") # thread states not properly maintained def test_process_state_with_dsym(self): diff --git a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py index 1e30185cbdb..432472307f9 100644 --- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py +++ b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py @@ -12,7 +12,7 @@ class ThreadExitTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @dsym_test def test_with_dsym(self): diff --git a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py index 1d32729d1c2..c3525c37ad6 100644 --- a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py +++ b/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py @@ -12,7 +12,7 @@ class ThreadSpecificBreakTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_python(self): diff --git a/lldb/test/functionalities/tty/TestTerminal.py b/lldb/test/functionalities/tty/TestTerminal.py index fb935e6e10f..e883056bb59 100644 --- a/lldb/test/functionalities/tty/TestTerminal.py +++ b/lldb/test/functionalities/tty/TestTerminal.py @@ -15,7 +15,7 @@ class LaunchInTerminalTestCase(TestBase): # Darwin is the only platform that I know of that supports optionally launching # a program in a separate terminal window. It would be great if other platforms # added support for this. - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin # If the test is being run under sudo, the spawned terminal won't retain that elevated diff --git a/lldb/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/test/functionalities/type_completion/TestTypeCompletion.py index eddb6cd5a43..361aa4a7867 100644 --- a/lldb/test/functionalities/type_completion/TestTypeCompletion.py +++ b/lldb/test/functionalities/type_completion/TestTypeCompletion.py @@ -12,7 +12,7 @@ class TypeCompletionTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Check that types only get completed when necessary.""" diff --git a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py index 2250ebfcb45..edc154dbb95 100644 --- a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py +++ b/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py @@ -11,7 +11,7 @@ import lldbutil class NoreturnUnwind(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): """Test that we can backtrace correctly with 'noreturn' functions on the stack""" diff --git a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py index 1c2e8edbc48..541fe51e939 100644 --- a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py +++ b/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py @@ -13,7 +13,7 @@ class SigtrampUnwind(TestBase): # On different platforms the "_sigtramp" and "__kill" frames are likely to be different. # This test could probably be adapted to run on linux/*bsd easily enough. - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): """Test that we can backtrace correctly with _sigtramp on the stack""" @@ -21,7 +21,7 @@ class SigtrampUnwind(TestBase): self.setTearDownCleanup() self.sigtramp_unwind_tests() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf (self): """Test that we can backtrace correctly with _sigtramp on the stack""" diff --git a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py index ad0e309dd7c..fa1a290c989 100644 --- a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py +++ b/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py @@ -12,7 +12,7 @@ class ValueMD5CrashTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Verify that the hash computing logic for ValueObject's values can't crash us.""" diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py index 3cced4e081b..302bb2f540c 100644 --- a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py +++ b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py @@ -13,7 +13,7 @@ class HelloWatchLocationTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_hello_watchlocation_with_dsym(self): """Test watching a location with '-s size' option.""" diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py index 09936c8febb..fbe2d4798bf 100644 --- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py +++ b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py @@ -13,7 +13,7 @@ class WatchpointForMultipleThreadsTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchpoint_multiple_threads_with_dsym(self): """Test that lldb watchpoint works for multiple threads.""" @@ -30,7 +30,7 @@ class WatchpointForMultipleThreadsTestCase(TestBase): self.setTearDownCleanup(dictionary=self.d) self.hello_multiple_threads() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchpoint_multiple_threads_wp_set_and_then_delete_with_dsym(self): """Test that lldb watchpoint works for multiple threads, and after the watchpoint is deleted, the watchpoint event should no longer fires.""" diff --git a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py index 30947f4a3f9..d4bccf9e852 100644 --- a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py +++ b/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py @@ -13,7 +13,7 @@ class TestStepOverWatchpoint(TestBase): def getCategories(self): return ['basic_process'] - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test stepping over watchpoints.""" diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py index fa32b37bd38..74c5d11d73d 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py @@ -26,7 +26,7 @@ class WatchpointCommandsTestCase(TestBase): self.exe_name = self.testMethodName self.d = {'C_SOURCES': self.source, 'EXE': self.exe_name} - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rw_watchpoint_with_dsym(self): """Test read_write watchpoint and expect to stop two times.""" @@ -41,7 +41,7 @@ class WatchpointCommandsTestCase(TestBase): self.setTearDownCleanup(dictionary=self.d) self.normal_read_write_watchpoint() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rw_watchpoint_delete_with_dsym(self): """Test delete watchpoint and expect not to stop for watchpoint.""" @@ -56,7 +56,7 @@ class WatchpointCommandsTestCase(TestBase): self.setTearDownCleanup(dictionary=self.d) self.delete_read_write_watchpoint() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rw_watchpoint_set_ignore_count_with_dsym(self): """Test watchpoint ignore count and expect to not to stop at all.""" @@ -71,7 +71,7 @@ class WatchpointCommandsTestCase(TestBase): self.setTearDownCleanup(dictionary=self.d) self.ignore_read_write_watchpoint() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rw_disable_after_first_stop_with_dsym(self): """Test read_write watchpoint but disable it after the first stop.""" @@ -86,7 +86,7 @@ class WatchpointCommandsTestCase(TestBase): self.setTearDownCleanup(dictionary=self.d) self.read_write_watchpoint_disable_after_first_stop() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_rw_disable_then_enable_with_dsym(self): """Test read_write watchpoint, disable initially, then enable it.""" diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py index ac04cd9b168..025d1f40bcc 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py @@ -25,7 +25,7 @@ class WatchpointLLDBCommandTestCase(TestBase): self.exe_name = 'a%d.out' % self.test_number self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name} - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchpoint_command_with_dsym(self): """Test 'watchpoint command'.""" @@ -40,7 +40,7 @@ class WatchpointLLDBCommandTestCase(TestBase): self.setTearDownCleanup(dictionary=self.d) self.watchpoint_command() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchpoint_command_can_disable_a_watchpoint_with_dsym(self): """Test that 'watchpoint command' action can disable a watchpoint after it is triggered.""" diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py index 4b09b9fc181..64695ab72b9 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py @@ -25,7 +25,7 @@ class WatchpointPythonCommandTestCase(TestBase): self.exe_name = self.testMethodName self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name} - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchpoint_command_with_dsym(self): """Test 'watchpoint command'.""" diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py index 193b6f1f5f7..21e1d992d26 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py @@ -25,7 +25,7 @@ class WatchpointConditionCmdTestCase(TestBase): self.exe_name = self.testMethodName self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name} - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchpoint_cond_with_dsym(self): """Test watchpoint condition.""" diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py index 7dd86f25d51..25f10a9d804 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py @@ -10,7 +10,7 @@ class TestWatchpointEvents (TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py index 0b8d1d6a45c..a711e7c0457 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py @@ -12,7 +12,7 @@ class WatchLocationUsingWatchpointSetTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_watchlocation_with_dsym_using_watchpoint_set(self): """Test watching a location with 'watchpoint set expression -w write -s size' option.""" |
