Index: test/benchmarks/continue/TestBenchmarkContinue.py =================================================================== --- test/benchmarks/continue/TestBenchmarkContinue.py +++ test/benchmarks/continue/TestBenchmarkContinue.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) @benchmarks_test - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Benchmark different ways to continue a process""" Index: test/driver/batch_mode/TestBatchMode.py =================================================================== --- test/driver/batch_mode/TestBatchMode.py +++ test/driver/batch_mode/TestBatchMode.py @@ -15,7 +15,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @unittest2.expectedFailure(", lldb doesn't reliably print the prompt when run under pexpect") @dsym_test def test_driver_batch_mode_with_dsym(self): Index: test/expression_command/call-function/TestCallStdStringFunction.py =================================================================== --- test/expression_command/call-function/TestCallStdStringFunction.py +++ test/expression_command/call-function/TestCallStdStringFunction.py @@ -18,7 +18,7 @@ self.line = line_number('main.cpp', '// Please test these expressions while stopped at this line:') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @expectedFailureDarwin(16361880) # , we get the result correctly, but fail to invoke the Summary formatter. def test_with_dsym(self): Index: test/expression_command/call-function/TestCallStopAndContinue.py =================================================================== --- test/expression_command/call-function/TestCallStopAndContinue.py +++ test/expression_command/call-function/TestCallStopAndContinue.py @@ -20,7 +20,7 @@ self.func_line = line_number ('main.cpp', '{ 5, "five" }') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @expectedFailureDarwin("llvm.org/pr20274") # intermittent failure on MacOSX def test_with_dsym(self): Index: test/expression_command/call-restarts/TestCallThatRestarts.py =================================================================== --- test/expression_command/call-restarts/TestCallThatRestarts.py +++ test/expression_command/call-restarts/TestCallThatRestarts.py @@ -19,7 +19,7 @@ self.main_source_spec = lldb.SBFileSpec (self.main_source) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @skipIfDarwin # llvm.org/pr19246: intermittent failure def test_with_dsym(self): Index: test/expression_command/call-throws/TestCallThatThrows.py =================================================================== --- test/expression_command/call-throws/TestCallThatThrows.py +++ test/expression_command/call-throws/TestCallThatThrows.py @@ -19,14 +19,14 @@ self.main_source_spec = lldb.SBFileSpec (self.main_source) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test calling a function that throws and ObjC exception.""" self.buildDsym() self.call_function() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin due to ObjC test case") + @skipUnlessDarwin @dwarf_test def test_with_dwarf(self): """Test calling a function that throws and ObjC exception.""" Index: test/expression_command/formatters/TestFormatters.py =================================================================== --- test/expression_command/formatters/TestFormatters.py +++ test/expression_command/formatters/TestFormatters.py @@ -18,7 +18,7 @@ self.line = line_number('main.cpp', '// Stop here') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test expr + formatters for good interoperability.""" Index: test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py =================================================================== --- test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py +++ test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py @@ -17,14 +17,14 @@ # Find the line number to break for main.cpp. self.line = line_number('main.m','// break here') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test that we can p *objcObject""" self.buildDsym() self.do_my_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin due to ObjC test case") + @skipUnlessDarwin @dwarf_test def test_with_dwarf(self): """Test that we can p *objcObject""" Index: test/expression_command/po_verbosity/TestPoVerbosity.py =================================================================== --- test/expression_command/po_verbosity/TestPoVerbosity.py +++ test/expression_command/po_verbosity/TestPoVerbosity.py @@ -18,14 +18,14 @@ self.line = line_number('main.m', '// Stop here') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test that the po command acts correctly.""" self.buildDsym() self.do_my_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin due to ObjC test case") + @skipUnlessDarwin @dwarf_test def test_with_dwarf(self): """Test that the po command acts correctly.""" Index: test/expression_command/timeout/TestCallWithTimeout.py =================================================================== --- test/expression_command/timeout/TestCallWithTimeout.py +++ test/expression_command/timeout/TestCallWithTimeout.py @@ -19,7 +19,7 @@ self.main_source_spec = lldb.SBFileSpec (self.main_source) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test calling std::String member function.""" Index: test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py =================================================================== --- test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py +++ test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py @@ -20,14 +20,14 @@ self.line = line_number('main.m', "// Set breakpoint here, then do 'expr (NSArray*)array_token'.") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """The expression parser's type search should be wider than the current compilation unit.""" self.buildDsym() self.type_query_from_other_cu() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf(self): """The expression parser's type search should be wider than the current compilation unit.""" Index: test/functionalities/abbreviation/TestAbbreviations.py =================================================================== --- test/functionalities/abbreviation/TestAbbreviations.py +++ test/functionalities/abbreviation/TestAbbreviations.py @@ -13,7 +13,7 @@ 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 @@ 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 () Index: test/functionalities/abbreviation/TestCommonShortSpellings.py =================================================================== --- test/functionalities/abbreviation/TestCommonShortSpellings.py +++ test/functionalities/abbreviation/TestCommonShortSpellings.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/functionalities/alias/TestAliases.py =================================================================== --- test/functionalities/alias/TestAliases.py +++ test/functionalities/alias/TestAliases.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/functionalities/asan/TestMemoryHistory.py =================================================================== --- test/functionalities/asan/TestMemoryHistory.py +++ test/functionalities/asan/TestMemoryHistory.py @@ -19,7 +19,7 @@ @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) Index: test/functionalities/asan/TestReportData.py =================================================================== --- test/functionalities/asan/TestReportData.py +++ test/functionalities/asan/TestReportData.py @@ -20,7 +20,7 @@ @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) Index: test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py =================================================================== --- test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -18,7 +18,7 @@ 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.""" Index: test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py =================================================================== --- test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py +++ test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py @@ -14,7 +14,7 @@ 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): Index: test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py =================================================================== --- test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py +++ test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py =================================================================== --- test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py +++ test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py @@ -12,21 +12,21 @@ 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 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 @@ 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 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 @@ @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() Index: test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py =================================================================== --- test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py +++ test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py =================================================================== --- test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py +++ test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py @@ -12,14 +12,14 @@ 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 '.""" 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): Index: test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py =================================================================== --- test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py +++ test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py =================================================================== --- test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py +++ test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py =================================================================== --- test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py +++ test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py @@ -14,7 +14,7 @@ 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): Index: test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py =================================================================== --- test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py +++ test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py @@ -12,7 +12,7 @@ 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. """ Index: test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py =================================================================== --- test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py +++ test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py @@ -14,7 +14,7 @@ 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).""" Index: test/functionalities/breakpoint/objc/TestObjCBreakpoints.py =================================================================== --- test/functionalities/breakpoint/objc/TestObjCBreakpoints.py +++ test/functionalities/breakpoint/objc/TestObjCBreakpoints.py @@ -11,7 +11,7 @@ import shutil import subprocess -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class TestObjCBreakpoints(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/functionalities/command_script/TestCommandScript.py =================================================================== --- test/functionalities/command_script/TestCommandScript.py +++ test/functionalities/command_script/TestCommandScript.py @@ -11,7 +11,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/functionalities/conditional_break/TestConditionalBreak.py =================================================================== --- test/functionalities/conditional_break/TestConditionalBreak.py +++ test/functionalities/conditional_break/TestConditionalBreak.py @@ -17,7 +17,7 @@ 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 @@ 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().""" Index: test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py =================================================================== --- test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py +++ test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py =================================================================== --- test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py +++ test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py =================================================================== --- test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py +++ test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py =================================================================== --- test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py +++ test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py =================================================================== --- test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py +++ test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py =================================================================== --- test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py +++ test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py =================================================================== --- test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py +++ test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py =================================================================== --- test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -14,14 +14,14 @@ 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 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py =================================================================== --- test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py +++ test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py @@ -12,7 +12,7 @@ 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 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py =================================================================== --- test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py +++ test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py =================================================================== --- test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py =================================================================== --- test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py +++ test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py +++ test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py +++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py +++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py +++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py +++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py @@ -12,7 +12,7 @@ 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): Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py =================================================================== --- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py +++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py =================================================================== --- test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py +++ test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py =================================================================== --- test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py +++ test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py =================================================================== --- test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py +++ test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py @@ -13,7 +13,7 @@ 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""" Index: test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py =================================================================== --- test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py +++ test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py =================================================================== --- test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py +++ test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py =================================================================== --- test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py +++ test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py @@ -13,7 +13,7 @@ # 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.""" Index: test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py =================================================================== --- test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py +++ test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py @@ -13,14 +13,14 @@ # 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.""" Index: test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py =================================================================== --- test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py +++ test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py =================================================================== --- test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py +++ test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py =================================================================== --- test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py +++ test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py =================================================================== --- test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py +++ test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py =================================================================== --- test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py +++ test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py =================================================================== --- test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py +++ test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py =================================================================== --- test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py +++ test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py =================================================================== --- test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py +++ test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py @@ -13,7 +13,7 @@ # 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.""" Index: test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py =================================================================== --- test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py +++ test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py @@ -13,14 +13,14 @@ 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.""" Index: test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py =================================================================== --- test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py +++ test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py @@ -13,7 +13,7 @@ # 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.""" Index: test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py =================================================================== --- test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py +++ test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py @@ -13,7 +13,7 @@ # 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.""" Index: test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py =================================================================== --- test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py +++ test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py @@ -13,7 +13,7 @@ # 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.""" Index: test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py =================================================================== --- test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py +++ test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py =================================================================== --- test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py +++ test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py =================================================================== --- test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py +++ test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py =================================================================== --- test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py +++ test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py @@ -13,7 +13,7 @@ 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""" Index: test/functionalities/dead-strip/TestDeadStrip.py =================================================================== --- test/functionalities/dead-strip/TestDeadStrip.py +++ test/functionalities/dead-strip/TestDeadStrip.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/disassembly/TestDisassembleBreakpoint.py =================================================================== --- test/functionalities/disassembly/TestDisassembleBreakpoint.py +++ test/functionalities/disassembly/TestDisassembleBreakpoint.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py =================================================================== --- test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py +++ test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test @expectedFailurei386("to be figured out") Index: test/functionalities/embedded_interpreter/TestConvenienceVariables.py =================================================================== --- test/functionalities/embedded_interpreter/TestConvenienceVariables.py +++ test/functionalities/embedded_interpreter/TestConvenienceVariables.py @@ -9,7 +9,7 @@ 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): Index: test/functionalities/exec/TestExec.py =================================================================== --- test/functionalities/exec/TestExec.py +++ test/functionalities/exec/TestExec.py @@ -22,7 +22,7 @@ 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 @@ self.do_test () - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf (self): if self.getArchitecture() == 'x86_64': Index: test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py =================================================================== --- test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py +++ test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py @@ -15,7 +15,7 @@ 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.""" Index: test/functionalities/fat_archives/TestFatArchives.py =================================================================== --- test/functionalities/fat_archives/TestFatArchives.py +++ test/functionalities/fat_archives/TestFatArchives.py @@ -21,7 +21,7 @@ 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': Index: test/functionalities/inferior-assert/TestInferiorAssert.py =================================================================== --- test/functionalities/inferior-assert/TestInferiorAssert.py +++ test/functionalities/inferior-assert/TestInferiorAssert.py @@ -9,7 +9,7 @@ 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 @@ 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 @@ 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 @@ 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().""" Index: test/functionalities/inferior-changed/TestInferiorChanged.py =================================================================== --- test/functionalities/inferior-changed/TestInferiorChanged.py +++ test/functionalities/inferior-changed/TestInferiorChanged.py @@ -10,7 +10,7 @@ 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() Index: test/functionalities/inferior-crashing/TestInferiorCrashing.py =================================================================== --- test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -9,7 +9,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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() Index: test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py =================================================================== --- test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -10,7 +10,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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() Index: test/functionalities/inline-stepping/TestInlineStepping.py =================================================================== --- test/functionalities/inline-stepping/TestInlineStepping.py +++ test/functionalities/inline-stepping/TestInlineStepping.py @@ -10,7 +10,7 @@ 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 @@ 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): Index: test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py =================================================================== --- test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py +++ test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py @@ -14,7 +14,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym() Index: test/functionalities/memory/read/TestMemoryRead.py =================================================================== --- test/functionalities/memory/read/TestMemoryRead.py +++ test/functionalities/memory/read/TestMemoryRead.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/nosucharch/TestNoSuchArch.py =================================================================== --- test/functionalities/nosucharch/TestNoSuchArch.py +++ test/functionalities/nosucharch/TestNoSuchArch.py @@ -11,14 +11,14 @@ 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() Index: test/functionalities/paths/TestPaths.py =================================================================== --- test/functionalities/paths/TestPaths.py +++ test/functionalities/paths/TestPaths.py @@ -34,7 +34,7 @@ # 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 Index: test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py =================================================================== --- test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py +++ test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py @@ -13,7 +13,7 @@ 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""" Index: test/functionalities/process_attach/TestProcessAttach.py =================================================================== --- test/functionalities/process_attach/TestProcessAttach.py +++ test/functionalities/process_attach/TestProcessAttach.py @@ -14,7 +14,7 @@ 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 @@ 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""" Index: test/functionalities/process_launch/TestProcessLaunch.py =================================================================== --- test/functionalities/process_launch/TestProcessLaunch.py +++ test/functionalities/process_launch/TestProcessLaunch.py @@ -18,7 +18,7 @@ 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 @@ 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): Index: test/functionalities/recursion/TestValueObjectRecursion.py =================================================================== --- test/functionalities/recursion/TestValueObjectRecursion.py +++ test/functionalities/recursion/TestValueObjectRecursion.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/rerun/TestRerun.py =================================================================== --- test/functionalities/rerun/TestRerun.py +++ test/functionalities/rerun/TestRerun.py @@ -14,7 +14,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym() Index: test/functionalities/return-value/TestReturnValue.py =================================================================== --- test/functionalities/return-value/TestReturnValue.py +++ test/functionalities/return-value/TestReturnValue.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailurei386 @python_api_test @dsym_test Index: test/functionalities/set-data/TestSetData.py =================================================================== --- test/functionalities/set-data/TestSetData.py +++ test/functionalities/set-data/TestSetData.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class SetDataTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/functionalities/signal/TestSendSignal.py =================================================================== --- test/functionalities/signal/TestSendSignal.py +++ test/functionalities/signal/TestSendSignal.py @@ -10,7 +10,7 @@ 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.""" Index: test/functionalities/step-avoids-no-debug/TestStepNoDebug.py =================================================================== --- test/functionalities/step-avoids-no-debug/TestStepNoDebug.py +++ test/functionalities/step-avoids-no-debug/TestStepNoDebug.py @@ -13,7 +13,7 @@ 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 @@ 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 @@ 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): Index: test/functionalities/stop-hook/TestStopHookCmd.py =================================================================== --- test/functionalities/stop-hook/TestStopHookCmd.py +++ test/functionalities/stop-hook/TestStopHookCmd.py @@ -18,7 +18,7 @@ """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.""" Index: test/functionalities/stop-hook/TestStopHookMechanism.py =================================================================== --- test/functionalities/stop-hook/TestStopHookMechanism.py +++ test/functionalities/stop-hook/TestStopHookMechanism.py @@ -11,7 +11,7 @@ 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.""" Index: test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py =================================================================== --- test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py +++ test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py @@ -11,7 +11,7 @@ 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.""" Index: test/functionalities/target_command/TestTargetCommand.py =================================================================== --- test/functionalities/target_command/TestTargetCommand.py +++ test/functionalities/target_command/TestTargetCommand.py @@ -38,7 +38,7 @@ # 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 @@ 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.""" Index: test/functionalities/thread/TestNumThreads.py =================================================================== --- test/functionalities/thread/TestNumThreads.py +++ test/functionalities/thread/TestNumThreads.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/thread/break_after_join/TestBreakAfterJoin.py =================================================================== --- test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -12,7 +12,7 @@ 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): Index: test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py =================================================================== --- test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py +++ test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/thread/create_during_step/TestCreateDuringStep.py =================================================================== --- test/functionalities/thread/create_during_step/TestCreateDuringStep.py +++ test/functionalities/thread/create_during_step/TestCreateDuringStep.py @@ -12,7 +12,7 @@ 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 @@ 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 @@ 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): Index: test/functionalities/thread/exit_during_break/TestExitDuringBreak.py =================================================================== --- test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -12,7 +12,7 @@ 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): Index: test/functionalities/thread/exit_during_step/TestExitDuringStep.py =================================================================== --- test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -12,7 +12,7 @@ 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 @@ 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.""" Index: test/functionalities/thread/jump/TestThreadJump.py =================================================================== --- test/functionalities/thread/jump/TestThreadJump.py +++ test/functionalities/thread/jump/TestThreadJump.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/thread/multi_break/TestMultipleBreakpoints.py =================================================================== --- test/functionalities/thread/multi_break/TestMultipleBreakpoints.py +++ test/functionalities/thread/multi_break/TestMultipleBreakpoints.py @@ -12,7 +12,7 @@ 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): Index: test/functionalities/thread/state/TestThreadStates.py =================================================================== --- test/functionalities/thread/state/TestThreadStates.py +++ test/functionalities/thread/state/TestThreadStates.py @@ -12,7 +12,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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): Index: test/functionalities/thread/thread_exit/TestThreadExit.py =================================================================== --- test/functionalities/thread/thread_exit/TestThreadExit.py +++ test/functionalities/thread/thread_exit/TestThreadExit.py @@ -12,7 +12,7 @@ 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): Index: test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py =================================================================== --- test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py +++ test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py @@ -12,7 +12,7 @@ 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): Index: test/functionalities/tty/TestTerminal.py =================================================================== --- test/functionalities/tty/TestTerminal.py +++ test/functionalities/tty/TestTerminal.py @@ -15,7 +15,7 @@ # 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 Index: test/functionalities/type_completion/TestTypeCompletion.py =================================================================== --- test/functionalities/type_completion/TestTypeCompletion.py +++ test/functionalities/type_completion/TestTypeCompletion.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/unwind/noreturn/TestNoreturnUnwind.py =================================================================== --- test/functionalities/unwind/noreturn/TestNoreturnUnwind.py +++ test/functionalities/unwind/noreturn/TestNoreturnUnwind.py @@ -11,7 +11,7 @@ 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""" Index: test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py =================================================================== --- test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py +++ test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py @@ -13,7 +13,7 @@ # 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 @@ 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""" Index: test/functionalities/value_md5_crash/TestValueMD5Crash.py =================================================================== --- test/functionalities/value_md5_crash/TestValueMD5Crash.py +++ test/functionalities/value_md5_crash/TestValueMD5Crash.py @@ -12,7 +12,7 @@ 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.""" Index: test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py =================================================================== --- test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py +++ test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py =================================================================== --- test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py +++ test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py @@ -13,7 +13,7 @@ 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 @@ 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.""" Index: test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py =================================================================== --- test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py +++ test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py @@ -13,7 +13,7 @@ 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.""" Index: test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py =================================================================== --- test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py +++ test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py @@ -26,7 +26,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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.""" Index: test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py =================================================================== --- test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py +++ test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py @@ -25,7 +25,7 @@ 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 @@ 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.""" Index: test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py =================================================================== --- test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py +++ test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py @@ -25,7 +25,7 @@ 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'.""" Index: test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py =================================================================== --- test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py +++ test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py @@ -25,7 +25,7 @@ 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.""" Index: test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py =================================================================== --- test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py +++ test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py @@ -10,7 +10,7 @@ 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): Index: test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py =================================================================== --- test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py +++ test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py @@ -12,7 +12,7 @@ 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.""" Index: test/lang/c/array_types/TestArrayTypes.py =================================================================== --- test/lang/c/array_types/TestArrayTypes.py +++ test/lang/c/array_types/TestArrayTypes.py @@ -10,14 +10,14 @@ 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 'frame variable var_name' on some variables with array types.""" self.buildDsym() self.array_types() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): Index: test/lang/c/bitfields/TestBitfields.py =================================================================== --- test/lang/c/bitfields/TestBitfields.py +++ test/lang/c/bitfields/TestBitfields.py @@ -10,14 +10,14 @@ 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 'frame variable ...' on a variable with bitfields.""" self.buildDsym() self.bitfields_variable() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): @@ -26,7 +26,7 @@ self.bitfields_variable_python() @dwarf_test - @unittest2.skipIf(sys.platform.startswith("win32"), "BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)") + @skipIfWindows # BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800) def test_with_dwarf_and_run_command(self): """Test 'frame variable ...' on a variable with bitfields.""" self.buildDwarf() @@ -34,7 +34,7 @@ @python_api_test @dwarf_test - @unittest2.skipIf(sys.platform.startswith("win32"), "BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)") + @skipIfWindows # BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800) @expectedFailureGcc # GCC (4.6/4.7) generates incorrect code with unnamed bitfields. def test_with_dwarf_and_python_api(self): """Use Python APIs to inspect a bitfields variable.""" Index: test/lang/c/enum_types/TestEnumTypes.py =================================================================== --- test/lang/c/enum_types/TestEnumTypes.py +++ test/lang/c/enum_types/TestEnumTypes.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test 'image lookup -t days' and check for correct display and enum value printing.""" Index: test/lang/c/forward/TestForwardDeclaration.py =================================================================== --- test/lang/c/forward/TestForwardDeclaration.py +++ test/lang/c/forward/TestForwardDeclaration.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Display *bar_ptr when stopped on a function with forward declaration of struct bar.""" Index: test/lang/c/function_types/TestFunctionTypes.py =================================================================== --- test/lang/c/function_types/TestFunctionTypes.py +++ test/lang/c/function_types/TestFunctionTypes.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test 'callback' has function ptr type, then break on the function.""" @@ -23,7 +23,7 @@ self.buildDwarf() self.function_types() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_pointers_with_dsym(self): """Test that a function pointer to 'printf' works and can be called.""" Index: test/lang/c/global_variables/TestGlobalVariables.py =================================================================== --- test/lang/c/global_variables/TestGlobalVariables.py +++ test/lang/c/global_variables/TestGlobalVariables.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test 'frame variable --scope --no-args' which omits args and shows scopes.""" Index: test/lang/c/set_values/TestSetValues.py =================================================================== --- test/lang/c/set_values/TestSetValues.py +++ test/lang/c/set_values/TestSetValues.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test settings and readings of program variables.""" Index: test/lang/c/stepping/TestStepAndBreakpoints.py =================================================================== --- test/lang/c/stepping/TestStepAndBreakpoints.py +++ test/lang/c/stepping/TestStepAndBreakpoints.py @@ -13,7 +13,7 @@ def getCategories(self): return ['basic_process'] - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): Index: test/lang/c/stepping/TestThreadStepping.py =================================================================== --- test/lang/c/stepping/TestThreadStepping.py +++ test/lang/c/stepping/TestThreadStepping.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_step_out_with_dsym_and_run_command(self): """Exercise thread step-out and frame select followed by thread step-out.""" Index: test/lang/c/strings/TestCStrings.py =================================================================== --- test/lang/c/strings/TestCStrings.py +++ test/lang/c/strings/TestCStrings.py @@ -9,7 +9,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Tests that C strings work as expected in expressions""" Index: test/lang/c/tls_globals/TestTlsGlobals.py =================================================================== --- test/lang/c/tls_globals/TestTlsGlobals.py +++ test/lang/c/tls_globals/TestTlsGlobals.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test @unittest2.expectedFailure("rdar://7796742") def test_with_dsym(self): Index: test/lang/cpp/bool/TestCPPBool.py =================================================================== --- test/lang/cpp/bool/TestCPPBool.py +++ test/lang/cpp/bool/TestCPPBool.py @@ -9,7 +9,7 @@ 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 bool types work in the expression parser""" Index: test/lang/cpp/breakpoints/TestCPPBreakpoints.py =================================================================== --- test/lang/cpp/breakpoints/TestCPPBreakpoints.py +++ test/lang/cpp/breakpoints/TestCPPBreakpoints.py @@ -11,7 +11,7 @@ mydir = TestBase.compute_mydir(__file__) - @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.""" Index: test/lang/cpp/call-function/TestCallCPPFunction.py =================================================================== --- test/lang/cpp/call-function/TestCallCPPFunction.py +++ test/lang/cpp/call-function/TestCallCPPFunction.py @@ -10,7 +10,7 @@ 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 calling a function by basename""" Index: test/lang/cpp/char1632_t/TestChar1632T.py =================================================================== --- test/lang/cpp/char1632_t/TestChar1632T.py +++ test/lang/cpp/char1632_t/TestChar1632T.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test that the C++11 support for char16_t and char32_t works correctly.""" Index: test/lang/cpp/class_static/TestStaticVariables.py =================================================================== --- test/lang/cpp/class_static/TestStaticVariables.py +++ test/lang/cpp/class_static/TestStaticVariables.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) failing_compilers = ['clang', 'gcc'] - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that file and class static variables display correctly.""" @@ -26,7 +26,7 @@ self.buildDwarf() self.static_variable_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureClang(9980907) @expectedFailureGcc(9980907) @python_api_test Index: test/lang/cpp/class_types/TestClassTypes.py =================================================================== --- test/lang/cpp/class_types/TestClassTypes.py +++ test/lang/cpp/class_types/TestClassTypes.py @@ -12,14 +12,14 @@ mydir = TestBase.compute_mydir(__file__) failing_compilers = ['clang', 'gcc'] - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test 'frame variable this' when stopped on a class constructor.""" self.buildDsym() self.class_types() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): @@ -43,7 +43,7 @@ self.buildDwarf() self.breakpoint_creation_by_filespec_python() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin # rdar://problem/8557478 # test/class_types test failures: runCmd: expr this->m_c_int @dsym_test @@ -60,7 +60,7 @@ self.buildDwarf() self.class_types_expr_parser() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin # rdar://problem/8557478 # test/class_types test failures: runCmd: expr this->m_c_int @dsym_test Index: test/lang/cpp/class_types/TestClassTypesDisassembly.py =================================================================== --- test/lang/cpp/class_types/TestClassTypesDisassembly.py +++ test/lang/cpp/class_types/TestClassTypesDisassembly.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) failing_compilers = ['clang', 'gcc'] - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Disassemble each call frame when stopped on C's constructor.""" @@ -26,7 +26,7 @@ self.buildDwarf() self.disassemble_call_stack() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_python_api(self): Index: test/lang/cpp/diamond/TestDiamond.py =================================================================== --- test/lang/cpp/diamond/TestDiamond.py +++ test/lang/cpp/diamond/TestDiamond.py @@ -9,7 +9,7 @@ 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 virtual base classes work in when SBValue objects are used to explore the variable value""" Index: test/lang/cpp/dynamic-value/TestCppValueCast.py =================================================================== --- test/lang/cpp/dynamic-value/TestCppValueCast.py +++ test/lang/cpp/dynamic-value/TestCppValueCast.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) @unittest2.expectedFailure("rdar://problem/10808472 SBValue::Cast test case is failing (virtual inheritance)") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_value_cast_with_dsym_and_virtual_inheritance(self): @@ -31,7 +31,7 @@ self.setTearDownCleanup(dictionary=self.d_virtual) self.do_sbvalue_cast(self.exe_name) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_value_cast_with_dsym_and_regular_inheritance(self): Index: test/lang/cpp/dynamic-value/TestDynamicValue.py =================================================================== --- test/lang/cpp/dynamic-value/TestDynamicValue.py +++ test/lang/cpp/dynamic-value/TestDynamicValue.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_dynamic_vals_with_dsym(self): Index: test/lang/cpp/enum_types/TestCPP11EnumTypes.py =================================================================== --- test/lang/cpp/enum_types/TestCPP11EnumTypes.py +++ test/lang/cpp/enum_types/TestCPP11EnumTypes.py @@ -10,56 +10,56 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_int8_t(self): """Test C++11 enumeration class types as int8_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=int8_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_int16_t(self): """Test C++11 enumeration class types as int16_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=int16_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_int32_t(self): """Test C++11 enumeration class types as int32_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=int32_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_int64_t(self): """Test C++11 enumeration class types as int64_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=int64_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_uint8_t(self): """Test C++11 enumeration class types as uint8_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=uint8_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_uint16_t(self): """Test C++11 enumeration class types as uint16_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=uint16_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_uint32_t(self): """Test C++11 enumeration class types as uint32_t types.""" self.buildDsym(dictionary={'CFLAGS_EXTRAS': '"-DTEST_BLOCK_CAPTURED_VARS=uint32_t"'}) self.image_lookup_for_enum_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_uint64_t(self): """Test C++11 enumeration class types as uint64_t types.""" Index: test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py =================================================================== --- test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py +++ test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test lldb exception breakpoint command for CPP.""" Index: test/lang/cpp/namespace/TestNamespace.py =================================================================== --- test/lang/cpp/namespace/TestNamespace.py +++ test/lang/cpp/namespace/TestNamespace.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) # rdar://problem/8668674 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym_and_run_command(self): """Test that anonymous and named namespace variables display correctly.""" Index: test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py =================================================================== --- test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py +++ test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py @@ -10,7 +10,7 @@ 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 functions with the same name are resolved correctly""" Index: test/lang/cpp/rdar12991846/TestRdar12991846.py =================================================================== --- test/lang/cpp/rdar12991846/TestRdar12991846.py +++ test/lang/cpp/rdar12991846/TestRdar12991846.py @@ -27,7 +27,7 @@ mydir = TestBase.compute_mydir(__file__) @unittest2.expectedFailure("rdar://18684408") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr1_with_dsym(self): """Test that the expression parser returns proper Unicode strings.""" @@ -42,7 +42,7 @@ self.rdar12991846(expr=1) @unittest2.expectedFailure("rdar://18684408") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr2_with_dsym(self): """Test that the expression parser returns proper Unicode strings.""" @@ -57,7 +57,7 @@ self.rdar12991846(expr=2) @unittest2.expectedFailure("rdar://18684408") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr3_with_dsym(self): """Test that the expression parser returns proper Unicode strings.""" Index: test/lang/cpp/rvalue-references/TestRvalueReferences.py =================================================================== --- test/lang/cpp/rvalue-references/TestRvalueReferences.py +++ test/lang/cpp/rvalue-references/TestRvalueReferences.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailureClang("rdar://problem/11479676") @dsym_test def test_with_dsym_and_run_command(self): Index: test/lang/cpp/signed_types/TestSignedTypes.py =================================================================== --- test/lang/cpp/signed_types/TestSignedTypes.py +++ test/lang/cpp/signed_types/TestSignedTypes.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test that variables with signed types display correctly.""" Index: test/lang/cpp/static_members/TestCPPStaticMembers.py =================================================================== --- test/lang/cpp/static_members/TestCPPStaticMembers.py +++ test/lang/cpp/static_members/TestCPPStaticMembers.py @@ -9,7 +9,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @unittest2.expectedFailure # llvm.org/pr15401 @dsym_test def test_with_dsym_and_run_command(self): Index: test/lang/cpp/static_methods/TestCPPStaticMethods.py =================================================================== --- test/lang/cpp/static_methods/TestCPPStaticMethods.py +++ test/lang/cpp/static_methods/TestCPPStaticMethods.py @@ -10,7 +10,7 @@ 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 static methods are properly distinguished from regular methods""" Index: test/lang/cpp/stl/TestSTL.py =================================================================== --- test/lang/cpp/stl/TestSTL.py +++ test/lang/cpp/stl/TestSTL.py @@ -14,7 +14,7 @@ # rdar://problem/10400981 @unittest2.expectedFailure - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test some expressions involving STL data types.""" Index: test/lang/cpp/this/TestCPPThis.py =================================================================== --- test/lang/cpp/this/TestCPPThis.py +++ test/lang/cpp/this/TestCPPThis.py @@ -9,7 +9,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin #rdar://problem/9962849 #@expectedFailureClang @dsym_test Index: test/lang/cpp/unique-types/TestUniqueTypes.py =================================================================== --- test/lang/cpp/unique-types/TestUniqueTypes.py +++ test/lang/cpp/unique-types/TestUniqueTypes.py @@ -11,7 +11,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test for unique types of std::vector and std::vector.""" Index: test/lang/cpp/unsigned_types/TestUnsignedTypes.py =================================================================== --- test/lang/cpp/unsigned_types/TestUnsignedTypes.py +++ test/lang/cpp/unsigned_types/TestUnsignedTypes.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test that variables with unsigned types display correctly.""" Index: test/lang/cpp/virtual/TestVirtual.py =================================================================== --- test/lang/cpp/virtual/TestVirtual.py +++ test/lang/cpp/virtual/TestVirtual.py @@ -22,8 +22,8 @@ # Assert message. PRINTF_OUTPUT_GROKKED = "The printf output from compiled code is parsed correctly" - @unittest2.skipIf(sys.platform.startswith("win32"), "Process::GetSTDOUT unsupported on Windows. This test should be re-written to use stdout re-direction") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipIfWindows # Process::GetSTDOUT unsupported on Windows. This test should be re-written to use stdout re-direction + @skipUnlessDarwin def test_virtual_madness_dsym(self): """Test that expression works correctly with virtual inheritance as well as virtual function.""" self.buildDsym() Index: test/lang/cpp/wchar_t/TestCxxWCharT.py =================================================================== --- test/lang/cpp/wchar_t/TestCxxWCharT.py +++ test/lang/cpp/wchar_t/TestCxxWCharT.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test that C++ supports wchar_t correctly.""" Index: test/lang/objc/blocks/TestObjCIvarsInBlocks.py =================================================================== --- test/lang/objc/blocks/TestObjCIvarsInBlocks.py +++ test/lang/objc/blocks/TestObjCIvarsInBlocks.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin # This test requires the 2.0 runtime, so it will fail on i386. @expectedFailurei386 @python_api_test @@ -20,7 +20,7 @@ self.buildDsym() self.ivars_in_blocks() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test # This test requires the 2.0 runtime, so it will fail on i386. @expectedFailurei386 Index: test/lang/objc/forward-decl/TestForwardDecl.py =================================================================== --- test/lang/objc/forward-decl/TestForwardDecl.py +++ test/lang/objc/forward-decl/TestForwardDecl.py @@ -10,13 +10,13 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr_with_dsym(self): self.buildDsym() self.expr() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_expr_with_dwarf(self): self.buildDwarf() Index: test/lang/objc/foundation/TestConstStrings.py =================================================================== --- test/lang/objc/foundation/TestConstStrings.py +++ test/lang/objc/foundation/TestConstStrings.py @@ -9,7 +9,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class ConstStringTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/foundation/TestFoundationDisassembly.py =================================================================== --- test/lang/objc/foundation/TestFoundationDisassembly.py +++ test/lang/objc/foundation/TestFoundationDisassembly.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class FoundationDisassembleTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/foundation/TestObjCMethods.py =================================================================== --- test/lang/objc/foundation/TestObjCMethods.py +++ test/lang/objc/foundation/TestObjCMethods.py @@ -11,7 +11,7 @@ import lldbutil file_index = 0 -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class FoundationTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/foundation/TestObjCMethods2.py =================================================================== --- test/lang/objc/foundation/TestObjCMethods2.py +++ test/lang/objc/foundation/TestObjCMethods2.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class FoundationTestCase2(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/foundation/TestObjectDescriptionAPI.py =================================================================== --- test/lang/objc/foundation/TestObjectDescriptionAPI.py +++ test/lang/objc/foundation/TestObjectDescriptionAPI.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) # rdar://problem/10857337 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_find_global_variables_then_object_description_with_dsym(self): @@ -24,7 +24,7 @@ self.find_global_variables_then_object_description('a.out') # rdar://problem/10857337 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_find_global_variables_then_object_description_with_dwarf(self): Index: test/lang/objc/foundation/TestRuntimeTypes.py =================================================================== --- test/lang/objc/foundation/TestRuntimeTypes.py +++ test/lang/objc/foundation/TestRuntimeTypes.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class RuntimeTypesTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/foundation/TestSymbolTable.py =================================================================== --- test/lang/objc/foundation/TestSymbolTable.py +++ test/lang/objc/foundation/TestSymbolTable.py @@ -7,7 +7,7 @@ import lldb from lldbtest import * -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class FoundationSymtabTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/hidden-ivars/TestHiddenIvars.py =================================================================== --- test/lang/objc/hidden-ivars/TestHiddenIvars.py +++ test/lang/objc/hidden-ivars/TestHiddenIvars.py @@ -11,7 +11,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr_with_dsym(self): if self.getArchitecture() == 'i386': @@ -20,7 +20,7 @@ self.buildDsym() self.expr(False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr_stripped_with_dsym(self): if self.getArchitecture() == 'i386': @@ -29,7 +29,7 @@ self.buildDsym() self.expr(True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_expr_with_dwarf(self): if self.getArchitecture() == 'i386': @@ -38,7 +38,7 @@ self.buildDwarf() self.expr(False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_frame_variable_with_dsym(self): if self.getArchitecture() == 'i386': @@ -47,7 +47,7 @@ self.buildDsym() self.frame_var(False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_frame_variable_stripped_with_dsym(self): if self.getArchitecture() == 'i386': @@ -56,7 +56,7 @@ self.buildDsym() self.frame_var(True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_frame_variable_with_dwarf(self): if self.getArchitecture() == 'i386': @@ -66,7 +66,7 @@ self.frame_var(False) @unittest2.expectedFailure("rdar://18683637") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_frame_variable_across_modules_with_dsym(self): if self.getArchitecture() == 'i386': @@ -76,7 +76,7 @@ self.frame_var_type_access_across_module() @unittest2.expectedFailure("rdar://18683637") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_frame_variable_across_modules_with_dwarf(self): if self.getArchitecture() == 'i386': Index: test/lang/objc/objc++/TestObjCXX.py =================================================================== --- test/lang/objc/objc++/TestObjCXX.py +++ test/lang/objc/objc++/TestObjCXX.py @@ -20,7 +20,7 @@ self.buildDsym() self.do_testObjCXXClasses() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_break_with_dwarf(self): """Test ivars of Objective-C++ classes""" Index: test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py =================================================================== --- test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py +++ test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_baseclass_with_dsym(self): @@ -23,7 +23,7 @@ self.buildDsym() self.do_get_baseclass_info() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_get_baseclass_with_dwarf(self): Index: test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py =================================================================== --- test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py +++ test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test Index: test/lang/objc/objc-checker/TestObjCCheckers.py =================================================================== --- test/lang/objc/objc-checker/TestObjCCheckers.py +++ test/lang/objc/objc-checker/TestObjCCheckers.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_objc_checker_with_dsym(self): @@ -22,7 +22,7 @@ self.buildDsym() self.do_test_checkers() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_objc_checker_with_dwarf(self): Index: test/lang/objc/objc-class-method/TestObjCClassMethod.py =================================================================== --- test/lang/objc/objc-class-method/TestObjCClassMethod.py +++ test/lang/objc/objc-class-method/TestObjCClassMethod.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @expectedFailurei386 @@ -20,7 +20,7 @@ self.buildDsym() self.objc_class_method() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailurei386 @python_api_test @dwarf_test Index: test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py =================================================================== --- test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py +++ test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class ObjCDynamicSBTypeTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py =================================================================== --- test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py +++ test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test @expectedFailureDarwin("llvm.org/pr20271 rdar://18684107") @@ -24,7 +24,7 @@ self.buildDsym() self.do_get_dynamic_vals() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test @expectedFailureDarwin("llvm.org/pr20271 rdar://18684107") Index: test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py =================================================================== --- test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py +++ test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py @@ -10,7 +10,7 @@ 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): @@ -18,7 +18,7 @@ self.buildDsym() self.objc_ivar_offsets() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf_and_python_api(self): Index: test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py =================================================================== --- test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py +++ test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py @@ -10,7 +10,7 @@ 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): Index: test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py =================================================================== --- test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py +++ test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py @@ -14,7 +14,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_expr_with_dsym(self): self.buildDsym() Index: test/lang/objc/objc-optimized/TestObjcOptimized.py =================================================================== --- test/lang/objc/objc-optimized/TestObjcOptimized.py +++ test/lang/objc/objc-optimized/TestObjcOptimized.py @@ -16,7 +16,7 @@ # rdar://problem/9087739 # test failure: objc_optimized does not work for "-C clang -A i386" -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class ObjcOptimizedTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/objc-property/TestObjCProperty.py =================================================================== --- test/lang/objc/objc-property/TestObjCProperty.py +++ test/lang/objc/objc-property/TestObjCProperty.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_objc_properties_with_dsym(self): @@ -22,7 +22,7 @@ self.buildDsym() self.do_test_properties() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_objc_properties_with_dwarf(self): Index: test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py =================================================================== --- test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py +++ test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test # @dsym_test Index: test/lang/objc/objc-static-method/TestObjCStaticMethod.py =================================================================== --- test/lang/objc/objc-static-method/TestObjCStaticMethod.py +++ test/lang/objc/objc-static-method/TestObjCStaticMethod.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test # "expression" can't call functions in class methods @dsym_test @@ -19,7 +19,7 @@ self.buildDsym() self.objc_static_method() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test # "expression" can't call functions in class methods @dwarf_test Index: test/lang/objc/objc-stepping/TestObjCStepping.py =================================================================== --- test/lang/objc/objc-stepping/TestObjCStepping.py +++ test/lang/objc/objc-stepping/TestObjCStepping.py @@ -13,7 +13,7 @@ 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): @@ -21,7 +21,7 @@ self.buildDsym() self.objc_stepping() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf_and_python_api(self): Index: test/lang/objc/objc-struct-return/TestObjCStructReturn.py =================================================================== --- test/lang/objc/objc-struct-return/TestObjCStructReturn.py +++ test/lang/objc/objc-struct-return/TestObjCStructReturn.py @@ -10,7 +10,7 @@ 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): @@ -18,7 +18,7 @@ self.buildDsym() self.objc_class_method() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf_and_python_api(self): Index: test/lang/objc/objc-super/TestObjCSuper.py =================================================================== --- test/lang/objc/objc-super/TestObjCSuper.py +++ test/lang/objc/objc-super/TestObjCSuper.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailurei386 @python_api_test @dsym_test @@ -19,7 +19,7 @@ self.buildDsym() self.objc_super() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @expectedFailurei386 @python_api_test @dwarf_test Index: test/lang/objc/print-obj/TestPrintObj.py =================================================================== --- test/lang/objc/print-obj/TestPrintObj.py +++ test/lang/objc/print-obj/TestPrintObj.py @@ -7,7 +7,7 @@ import lldb from lldbtest import * -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class PrintObjTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py =================================================================== --- test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py +++ test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class MethodReturningBOOLTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/rdar-10967107/TestRdar10967107.py =================================================================== --- test/lang/objc/rdar-10967107/TestRdar10967107.py +++ test/lang/objc/rdar-10967107/TestRdar10967107.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class Rdar10967107TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/rdar-11355592/TestRdar11355592.py =================================================================== --- test/lang/objc/rdar-11355592/TestRdar11355592.py +++ test/lang/objc/rdar-11355592/TestRdar11355592.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class Rdar10967107TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/rdar-12408181/TestRdar12408181.py =================================================================== --- test/lang/objc/rdar-12408181/TestRdar12408181.py +++ test/lang/objc/rdar-12408181/TestRdar12408181.py @@ -8,7 +8,7 @@ from lldbtest import * import lldbutil -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class Rdar12408181TestCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/lang/objc/real-definition/TestRealDefinition.py =================================================================== --- test/lang/objc/real-definition/TestRealDefinition.py +++ test/lang/objc/real-definition/TestRealDefinition.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_frame_var_after_stop_at_interface_with_dsym(self): """Test that we can find the implementation for an objective C type""" @@ -19,7 +19,7 @@ self.buildDsym() self.stop_at_interface() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_frame_var_after_stop_at_interface_with_dwarf(self): """Test that we can find the implementation for an objective C type""" @@ -28,7 +28,7 @@ self.buildDwarf() self.stop_at_interface() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_frame_var_after_stop_at_implementation_with_dsym(self): """Test that we can find the implementation for an objective C type""" @@ -37,7 +37,7 @@ self.buildDsym() self.stop_at_implementation() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_frame_var_after_stop_at_implementation_with_dwarf(self): """Test that we can find the implementation for an objective C type""" Index: test/lang/objc/self/TestObjCSelf.py =================================================================== --- test/lang/objc/self/TestObjCSelf.py +++ test/lang/objc/self/TestObjCSelf.py @@ -9,14 +9,14 @@ 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 appropriate member variables are available when stopped in Objective-C class and instance methods""" self.buildDsym() self.self_commands() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf_and_run_command(self): """Test that the appropriate member variables are available when stopped in Objective-C class and instance methods""" Index: test/linux/builtin_trap/TestBuiltinTrap.py =================================================================== --- test/linux/builtin_trap/TestBuiltinTrap.py +++ test/linux/builtin_trap/TestBuiltinTrap.py @@ -13,7 +13,7 @@ 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 a function with __builtin_trap correctly.""" Index: test/lldbinline.py =================================================================== --- test/lldbinline.py +++ test/lldbinline.py @@ -114,7 +114,7 @@ makefile.close() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def __test_with_dsym(self): self.using_dsym = True self.BuildMakefile() Index: test/lldbtest.py =================================================================== --- test/lldbtest.py +++ test/lldbtest.py @@ -586,7 +586,7 @@ def expectedFailureOS(oslist, bugnumber=None, compilers=None): def fn(self): - return (lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] in oslist and + return (self.getPlatform() in oslist and self.expectedCompiler(compilers)) if bugnumber: return expectedFailure(fn, bugnumber) @@ -640,36 +640,6 @@ func(*args, **kwargs) return wrapper -def skipIfFreeBSD(func): - """Decorate the item to skip tests that should be skipped on FreeBSD.""" - if isinstance(func, type) and issubclass(func, unittest2.TestCase): - raise Exception("@skipIfFreeBSD can only be used to decorate a test method") - @wraps(func) - def wrapper(*args, **kwargs): - from unittest2 import case - self = args[0] - platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] - if "freebsd" in platform: - self.skipTest("skip on FreeBSD") - else: - func(*args, **kwargs) - return wrapper - -def skipIfLinux(func): - """Decorate the item to skip tests that should be skipped on Linux.""" - if isinstance(func, type) and issubclass(func, unittest2.TestCase): - raise Exception("@skipIfLinux can only be used to decorate a test method") - @wraps(func) - def wrapper(*args, **kwargs): - from unittest2 import case - self = args[0] - platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] - if "linux" in platform: - self.skipTest("skip on linux") - else: - func(*args, **kwargs) - return wrapper - def skipIfNoSBHeaders(func): """Decorate the item to mark tests that should be skipped when LLDB is built with no SB API headers.""" if isinstance(func, type) and issubclass(func, unittest2.TestCase): @@ -689,36 +659,53 @@ func(*args, **kwargs) return wrapper -def skipIfWindows(func): - """Decorate the item to skip tests that should be skipped on Windows.""" - if isinstance(func, type) and issubclass(func, unittest2.TestCase): - raise Exception("@skipIfWindows can only be used to decorate a test method") - @wraps(func) - def wrapper(*args, **kwargs): - from unittest2 import case - self = args[0] - platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] - if "windows" in platform: - self.skipTest("skip on Windows") - else: - func(*args, **kwargs) - return wrapper +def skipIfFreeBSD(func): + """Decorate the item to skip tests that should be skipped on FreeBSD.""" + return skipIfPlatform(["freebsd"])(func) def skipIfDarwin(func): """Decorate the item to skip tests that should be skipped on Darwin.""" - if isinstance(func, type) and issubclass(func, unittest2.TestCase): - raise Exception("@skipIfDarwin can only be used to decorate a test method") - @wraps(func) - def wrapper(*args, **kwargs): - from unittest2 import case - self = args[0] - platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] - if "darwin" in platform or "macosx" in platform: - self.skipTest("skip on darwin") - else: - func(*args, **kwargs) - return wrapper + return skipIfPlatform(["darwin", "macosx"])(func) + +def skipIfLinux(func): + """Decorate the item to skip tests that should be skipped on Linux.""" + return skipIfPlatform(["linux"])(func) + +def skipIfWindows(func): + """Decorate the item to skip tests that should be skipped on Windows.""" + return skipIfPlatform(["windows"])(func) + +def skipUnlessDarwin(func): + """Decorate the item to skip tests that should be skipped on any non Darwin platform.""" + return skipUnlessPlatform(["darwin", "macosx"])(func) +def skipIfPlatform(oslist): + """Decorate the item to skip tests if running on one of the listed platforms.""" + def decorator(func): + @wraps(func) + def wrapper(*args, **kwargs): + from unittest2 import case + self = args[0] + if self.getPlatform() in oslist: + self.skipTest("skip on %s" % (", ".join(oslist))) + else: + func(*args, **kwargs) + return wrapper + return decorator + +def skipUnlessPlatform(oslist): + """Decorate the item to skip tests unless running on one of the listed platforms.""" + def decorator(func): + @wraps(func) + def wrapper(*args, **kwargs): + from unittest2 import case + self = args[0] + if not (self.getPlatform() in oslist): + self.skipTest("requires one of %s" % (", ".join(oslist))) + else: + func(*args, **kwargs) + return wrapper + return decorator def skipIfLinuxClang(func): """Decorate the item to skip tests that should be skipped if building on @@ -1399,6 +1386,10 @@ version = m.group(1) return version + def getPlatform(self): + """Returns the platform the test suite is running on.""" + return lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2] + def isIntelCompiler(self): """ Returns true if using an Intel (ICC) compiler, false otherwise. """ return any([x in self.getCompiler() for x in ["icc", "icpc", "icl"]]) Index: test/logging/TestLogging.py =================================================================== --- test/logging/TestLogging.py +++ test/logging/TestLogging.py @@ -20,7 +20,7 @@ cls.RemoveTempFile(cls.truncate_log_file) cls.RemoveTempFile(cls.append_log_file) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym (self): self.buildDsym () Index: test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py =================================================================== --- test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py +++ test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py @@ -6,7 +6,7 @@ import sys from lldbtest import * -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class AddDsymMidExecutionCommandCase(TestBase): mydir = TestBase.compute_mydir(__file__) Index: test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py =================================================================== --- test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py +++ test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) #rdar://problem/11166975 - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_debug_info_for_apple_types(self): """Test that __apple_types section does get produced by clang.""" @@ -23,7 +23,7 @@ self.buildDefault() self.apple_types(dot_o=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_debug_info_for_apple_types_dsym(self): """Test that __apple_types section does get produced by dsymutil. This is supposed to succeed even with rdar://problem/11166975.""" Index: test/macosx/indirect_symbol/TestIndirectSymbols.py =================================================================== --- test/macosx/indirect_symbol/TestIndirectSymbols.py +++ test/macosx/indirect_symbol/TestIndirectSymbols.py @@ -10,7 +10,7 @@ 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): @@ -18,7 +18,7 @@ self.buildDsym() self.indirect_stepping() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf_and_python_api(self): Index: test/macosx/order/TestOrderFile.py =================================================================== --- test/macosx/order/TestOrderFile.py +++ test/macosx/order/TestOrderFile.py @@ -12,14 +12,14 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_with_dsym(self): """Test debug symbols follow the correct order by the order file.""" self.buildDsym() self.order_file() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dwarf_test def test_with_dwarf(self): """Test debug symbols follow the correct order by the order file.""" Index: test/macosx/queues/TestQueues.py =================================================================== --- test/macosx/queues/TestQueues.py +++ test/macosx/queues/TestQueues.py @@ -10,7 +10,7 @@ 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): @@ -19,7 +19,7 @@ self.queues() self.queues_with_libBacktraceRecording() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf_and_python_api(self): Index: test/macosx/safe-to-func-call/TestSafeFuncCalls.py =================================================================== --- test/macosx/safe-to-func-call/TestSafeFuncCalls.py +++ test/macosx/safe-to-func-call/TestSafeFuncCalls.py @@ -10,7 +10,7 @@ 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): @@ -18,7 +18,7 @@ self.buildDsym() self.function_call_safety_check() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf_and_python_api(self): Index: test/macosx/universal/TestUniversal.py =================================================================== --- test/macosx/universal/TestUniversal.py +++ test/macosx/universal/TestUniversal.py @@ -17,8 +17,8 @@ self.line = line_number('main.c', '// Set break point at this line.') @python_api_test - @unittest2.skipUnless(sys.platform.startswith("darwin") and os.uname()[4] in ['i386', 'x86_64'], - "requires Darwin & i386") + @skipUnlessDarwin + @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires i386 or x86_64") def test_sbdebugger_create_target_with_file_and_target_triple(self): """Test the SBDebugger.CreateTargetWithFileAndTargetTriple() API.""" # Invoke the default build rule. @@ -35,8 +35,8 @@ process = target.LaunchSimple (None, None, self.get_process_working_directory()) self.assertTrue(process, PROCESS_IS_VALID) - @unittest2.skipUnless(sys.platform.startswith("darwin") and os.uname()[4] in ['i386', 'x86_64'], - "requires Darwin & i386") + @skipUnlessDarwin + @unittest2.skipUnless(os.uname()[4] in ['i386', 'x86_64'], "requires i386 or x86_64") def test_process_launch_for_universal(self): """Test process launch of a universal binary.""" from lldbutil import print_registers Index: test/python_api/breakpoint/TestBreakpointAPI.py =================================================================== --- test/python_api/breakpoint/TestBreakpointAPI.py +++ test/python_api/breakpoint/TestBreakpointAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_breakpoint_is_valid_with_dsym(self): Index: test/python_api/class_members/TestSBTypeClassMembers.py =================================================================== --- test/python_api/class_members/TestSBTypeClassMembers.py +++ test/python_api/class_members/TestSBTypeClassMembers.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): @@ -22,7 +22,7 @@ self.setTearDownCleanup(dictionary=d) self.type_api(self.exe_name) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf(self): Index: test/python_api/event/TestEvents.py =================================================================== --- test/python_api/event/TestEvents.py +++ test/python_api/event/TestEvents.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_listen_for_and_print_event_with_dsym(self): @@ -20,9 +20,7 @@ self.buildDsym() self.do_listen_for_and_print_event() - @unittest2.skipUnless((sys.platform.startswith("darwin") or - sys.platform.startswith("freebsd")), - "requires Darwin or FreeBSD") + @skipUnlessPlatform(["darwin", "macosx", "freebsd"]) @python_api_test @dwarf_test def test_listen_for_and_print_event_with_dwarf(self): @@ -30,7 +28,7 @@ self.buildDwarf() self.do_listen_for_and_print_event() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_wait_for_event_with_dsym(self): @@ -46,7 +44,7 @@ self.buildDwarf() self.do_wait_for_event() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_add_listener_to_broadcaster_with_dsym(self): Index: test/python_api/findvalue_duplist/TestSBFrameFindValue.py =================================================================== --- test/python_api/findvalue_duplist/TestSBFrameFindValue.py +++ test/python_api/findvalue_duplist/TestSBFrameFindValue.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_formatters_api(self): Index: test/python_api/formatters/TestFormattersSBAPI.py =================================================================== --- test/python_api/formatters/TestFormattersSBAPI.py +++ test/python_api/formatters/TestFormattersSBAPI.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_formatters_api(self): Index: test/python_api/frame/TestFrames.py =================================================================== --- test/python_api/frame/TestFrames.py +++ test/python_api/frame/TestFrames.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_arg_vals_for_call_stack_with_dsym(self): Index: test/python_api/frame/inlines/TestInlinedFrame.py =================================================================== --- test/python_api/frame/inlines/TestInlinedFrame.py +++ test/python_api/frame/inlines/TestInlinedFrame.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_stop_at_outer_inline_with_dsym(self): Index: test/python_api/function_symbol/TestDisasmAPI.py =================================================================== --- test/python_api/function_symbol/TestDisasmAPI.py +++ test/python_api/function_symbol/TestDisasmAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/function_symbol/TestSymbolAPI.py =================================================================== --- test/python_api/function_symbol/TestSymbolAPI.py +++ test/python_api/function_symbol/TestSymbolAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/hello_world/TestHelloWorld.py =================================================================== --- test/python_api/hello_world/TestHelloWorld.py +++ test/python_api/hello_world/TestHelloWorld.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_process_launch_api(self): @@ -34,7 +34,7 @@ self.hello_world_python() @not_remote_testsuite_ready - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_attach_to_process_with_id_api(self): @@ -59,7 +59,7 @@ self.hello_world_attach_with_id_api() @not_remote_testsuite_ready - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_attach_to_process_with_name_api(self): Index: test/python_api/interpreter/TestCommandInterpreterAPI.py =================================================================== --- test/python_api/interpreter/TestCommandInterpreterAPI.py +++ test/python_api/interpreter/TestCommandInterpreterAPI.py @@ -9,7 +9,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_process_launch_api(self): Index: test/python_api/objc_type/TestObjCType.py =================================================================== --- test/python_api/objc_type/TestObjCType.py +++ test/python_api/objc_type/TestObjCType.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): @@ -20,7 +20,7 @@ self.buildDsym() self.objc_sbtype_test() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dwarf_test def test_with_dwarf(self): Index: test/python_api/process/TestProcessAPI.py =================================================================== --- test/python_api/process/TestProcessAPI.py +++ test/python_api/process/TestProcessAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_read_memory_with_dsym(self): @@ -27,7 +27,7 @@ self.buildDwarf() self.read_memory() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_write_memory_with_dsym(self): @@ -42,7 +42,7 @@ self.buildDwarf() self.write_memory() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_access_my_int_with_dsym(self): Index: test/python_api/process/io/TestProcessIO.py =================================================================== --- test/python_api/process/io/TestProcessIO.py +++ test/python_api/process/io/TestProcessIO.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "dsym requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_stdin_by_api_with_dsym(self): @@ -18,7 +18,7 @@ self.buildDsym() self.do_stdin_by_api() - @unittest2.skipIf(sys.platform.startswith("win32"), "stdio manipulation unsupported on Windows") + @skipIfWindows # stdio manipulation unsupported on Windows @python_api_test @dwarf_test def test_stdin_by_api_with_dwarf(self): @@ -26,7 +26,7 @@ self.buildDwarf() self.do_stdin_by_api() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "dsym requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_stdin_redirection_with_dsym(self): @@ -34,7 +34,7 @@ self.buildDsym() self.do_stdin_redirection() - @unittest2.skipIf(sys.platform.startswith("win32"), "stdio manipulation unsupported on Windows") + @skipIfWindows # stdio manipulation unsupported on Windows @python_api_test @dwarf_test def test_stdin_redirection_with_dwarf(self): @@ -42,7 +42,7 @@ self.buildDwarf() self.do_stdin_redirection() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "dsym requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_stdout_redirection_with_dsym(self): @@ -50,7 +50,7 @@ self.buildDsym() self.do_stdout_redirection() - @unittest2.skipIf(sys.platform.startswith("win32"), "stdio manipulation unsupported on Windows") + @skipIfWindows # stdio manipulation unsupported on Windows @python_api_test @dwarf_test def test_stdout_redirection_with_dwarf(self): @@ -58,7 +58,7 @@ self.buildDwarf() self.do_stdout_redirection() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "dsym requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_stderr_redirection_with_dsym(self): @@ -66,7 +66,7 @@ self.buildDsym() self.do_stderr_redirection() - @unittest2.skipIf(sys.platform.startswith("win32"), "stdio manipulation unsupported on Windows") + @skipIfWindows # stdio manipulation unsupported on Windows @python_api_test @dwarf_test def test_stderr_redirection_with_dwarf(self): @@ -74,7 +74,7 @@ self.buildDwarf() self.do_stderr_redirection() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "dsym requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_stdout_stderr_redirection_with_dsym(self): @@ -82,7 +82,7 @@ self.buildDsym() self.do_stdout_stderr_redirection() - @unittest2.skipIf(sys.platform.startswith("win32"), "stdio manipulation unsupported on Windows") + @skipIfWindows # stdio manipulation unsupported on Windows @python_api_test @dwarf_test def test_stdout_stderr_redirection_with_dwarf(self): Index: test/python_api/rdar-12481949/Test-rdar-12481949.py =================================================================== --- test/python_api/rdar-12481949/Test-rdar-12481949.py +++ test/python_api/rdar-12481949/Test-rdar-12481949.py @@ -13,7 +13,7 @@ # test for rdar://problem/12481949 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 SBValue.GetValueAsSigned() does the right thing for a 32-bit -1.""" Index: test/python_api/sbdata/TestSBData.py =================================================================== --- test/python_api/sbdata/TestSBData.py +++ test/python_api/sbdata/TestSBData.py @@ -11,7 +11,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_run_command(self): Index: test/python_api/sbvalue_persist/TestSBValuePersist.py =================================================================== --- test/python_api/sbvalue_persist/TestSBValuePersist.py +++ test/python_api/sbvalue_persist/TestSBValuePersist.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/section/TestSectionAPI.py =================================================================== --- test/python_api/section/TestSectionAPI.py +++ test/python_api/section/TestSectionAPI.py @@ -9,7 +9,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_target_byte_size_with_dsym(self): Index: test/python_api/symbol-context/TestSymbolContext.py =================================================================== --- test/python_api/symbol-context/TestSymbolContext.py +++ test/python_api/symbol-context/TestSymbolContext.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/target/TestTargetAPI.py =================================================================== --- test/python_api/target/TestTargetAPI.py +++ test/python_api/target/TestTargetAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_find_global_variables_with_dsym(self): @@ -38,7 +38,7 @@ self.setTearDownCleanup(dictionary=d) self.find_global_variables('b.out') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_find_functions_with_dsym(self): @@ -57,7 +57,7 @@ self.setTearDownCleanup(dictionary=d) self.find_functions('b.out') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_description_with_dsym(self): @@ -72,7 +72,7 @@ self.buildDwarf() self.get_description() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test @expectedFailureDarwin("llvm.org/pr20273") @@ -89,7 +89,7 @@ self.buildDwarf() self.launch_new_process_and_redirect_stdout() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_resolve_symbol_context_with_address_with_dsym(self): @@ -104,7 +104,7 @@ self.buildDwarf() self.resolve_symbol_context_with_address() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_platform_with_dsym(self): @@ -125,7 +125,7 @@ platform = target.platform self.assertTrue(platform, VALID_PLATFORM) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_data_byte_size_with_dsym(self): @@ -144,7 +144,7 @@ target = self.create_simple_target('b.out') self.assertEquals(target.data_byte_size, 1) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_code_byte_size_with_dsym(self): @@ -163,7 +163,7 @@ target = self.create_simple_target('b.out') self.assertEquals(target.code_byte_size, 1) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_resolve_file_address_with_dsym(self): @@ -182,7 +182,7 @@ target = self.create_simple_target('b.out') self.resolve_file_address(target) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_read_memory_with_dsym(self): Index: test/python_api/thread/TestThreadAPI.py =================================================================== --- test/python_api/thread/TestThreadAPI.py +++ test/python_api/thread/TestThreadAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_process_with_dsym(self): @@ -27,7 +27,7 @@ self.buildDwarf() self.get_process() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_get_stop_description_with_dsym(self): @@ -42,7 +42,7 @@ self.buildDwarf() self.get_stop_description() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_run_to_address_with_dsym(self): @@ -63,7 +63,7 @@ self.setTearDownCleanup(dictionary=d) self.run_to_address(self.exe_name) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_out_of_malloc_into_function_b_with_dsym(self): @@ -86,7 +86,7 @@ self.setTearDownCleanup(dictionary=d) self.step_out_of_malloc_into_function_b(self.exe_name) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_step_over_3_times_with_dsym(self): Index: test/python_api/type/TestTypeList.py =================================================================== --- test/python_api/type/TestTypeList.py +++ test/python_api/type/TestTypeList.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/value/TestValueAPI.py =================================================================== --- test/python_api/value/TestValueAPI.py +++ test/python_api/value/TestValueAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/value/change_values/TestChangeValueAPI.py =================================================================== --- test/python_api/value/change_values/TestChangeValueAPI.py +++ test/python_api/value/change_values/TestChangeValueAPI.py @@ -12,7 +12,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_change_value_with_dsym(self): Index: test/python_api/value/linked_list/TestValueAPILinkedList.py =================================================================== --- test/python_api/value/linked_list/TestValueAPILinkedList.py +++ test/python_api/value/linked_list/TestValueAPILinkedList.py @@ -13,7 +13,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym(self): Index: test/python_api/value_var_update/TestValueVarUpdate.py =================================================================== --- test/python_api/value_var_update/TestValueVarUpdate.py +++ test/python_api/value_var_update/TestValueVarUpdate.py @@ -10,7 +10,7 @@ mydir = TestBase.compute_mydir(__file__) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_with_dsym_and_process_launch_api(self): Index: test/python_api/watchpoint/TestSetWatchpoint.py =================================================================== --- test/python_api/watchpoint/TestSetWatchpoint.py +++ test/python_api/watchpoint/TestSetWatchpoint.py @@ -20,7 +20,7 @@ # Find the line number to break inside main(). self.line = line_number(self.source, '// Set break point at this line.') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_watch_val_with_dsym(self): Index: test/python_api/watchpoint/TestWatchpointIgnoreCount.py =================================================================== --- test/python_api/watchpoint/TestWatchpointIgnoreCount.py +++ test/python_api/watchpoint/TestWatchpointIgnoreCount.py @@ -20,7 +20,7 @@ # Find the line number to break inside main(). self.line = line_number(self.source, '// Set break point at this line.') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_set_watch_ignore_count_with_dsym(self): Index: test/python_api/watchpoint/TestWatchpointIter.py =================================================================== --- test/python_api/watchpoint/TestWatchpointIter.py +++ test/python_api/watchpoint/TestWatchpointIter.py @@ -20,7 +20,7 @@ # Find the line number to break inside main(). self.line = line_number(self.source, '// Set break point at this line.') - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_watch_iter_with_dsym(self): Index: test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py =================================================================== --- test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py +++ test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py @@ -25,7 +25,7 @@ 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_api_with_dsym(self): """Test watchpoint condition API.""" Index: test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py =================================================================== --- test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py +++ test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py @@ -22,7 +22,7 @@ # This is for verifying that watch location works. self.violating_func = "do_bad_thing_with_location"; - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_watch_location_with_dsym(self): Index: test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py =================================================================== --- test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py +++ test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py @@ -22,7 +22,7 @@ # This is for verifying that watch location works. self.violating_func = "do_bad_thing_with_location"; - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_watch_address_with_dsym(self): @@ -38,7 +38,7 @@ self.buildDwarf() self.do_set_watchaddress() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @python_api_test @dsym_test def test_watch_address_with_invalid_watch_size_with_dsym(self): Index: test/settings/TestSettings.py =================================================================== --- test/settings/TestSettings.py +++ test/settings/TestSettings.py @@ -199,7 +199,7 @@ self.expect("disassemble -n numberfn", substrs = ["5ah"]) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_run_args_and_env_vars_with_dsym(self): """Test that run-args and env-vars are passed to the launched process.""" Index: test/tools/lldb-mi/signal/TestMiSignal.py =================================================================== --- test/tools/lldb-mi/signal/TestMiSignal.py +++ test/tools/lldb-mi/signal/TestMiSignal.py @@ -80,7 +80,7 @@ @lldbmi_test @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_lldbmi_stopped_when_stopatentry_remote(self): """Test that 'lldb-mi --interpreter' notifies after it was stopped on entry (remote).""" @@ -156,7 +156,7 @@ @lldbmi_test @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_lldbmi_stopped_when_segfault_remote(self): """Test that 'lldb-mi --interpreter' notifies after it was stopped when segfault occurred (remote).""" Index: test/tools/lldb-mi/stack/TestMiStack.py =================================================================== --- test/tools/lldb-mi/stack/TestMiStack.py +++ test/tools/lldb-mi/stack/TestMiStack.py @@ -238,7 +238,7 @@ @lldbmi_test @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows") @skipIfFreeBSD # llvm.org/pr22411: Failure presumably due to known thread races - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_lldbmi_stack_info_frame(self): """Test that 'lldb-mi --interpreter' can show information about current frame.""" Index: test/tools/lldb-server/TestGdbRemoteProcessInfo.py =================================================================== --- test/tools/lldb-server/TestGdbRemoteProcessInfo.py +++ test/tools/lldb-server/TestGdbRemoteProcessInfo.py @@ -148,7 +148,7 @@ self.assertEquals(unexpected_key_set, set(), "the listed keys were present but unexpected in qProcessInfo result") - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @debugserver_test @dsym_test def test_qProcessInfo_contains_cputype_cpusubtype_debugserver_darwin(self): @@ -156,7 +156,7 @@ self.buildDsym() self.qProcessInfo_contains_keys(set(['cputype', 'cpusubtype'])) - @unittest2.skipUnless(sys.platform.startswith("linux"), "requires Linux") + @skipUnlessPlatform(["linux"]) @llgs_test @dwarf_test def test_qProcessInfo_contains_triple_llgs_linux(self): @@ -164,7 +164,7 @@ self.buildDwarf() self.qProcessInfo_contains_keys(set(['triple'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @debugserver_test @dsym_test def test_qProcessInfo_does_not_contain_triple_debugserver_darwin(self): @@ -175,7 +175,7 @@ # for the remote Host and Process. self.qProcessInfo_does_not_contain_keys(set(['triple'])) - @unittest2.skipUnless(sys.platform.startswith("linux"), "requires Linux") + @skipUnlessPlatform(["linux"]); @llgs_test @dwarf_test def test_qProcessInfo_does_not_contain_cputype_cpusubtype_llgs_linux(self): Index: test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py =================================================================== --- test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py +++ test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py @@ -141,7 +141,7 @@ self.set_inferior_startup_launch() self.qThreadStopInfo_has_valid_thread_names(self.THREAD_COUNT, "a.out") - @unittest2.skipUnless(sys.platform.startswith("linux"), "test requires OS with set, equal thread names by default") + @skipUnlessPlatform(["linux"]) # test requires OS with set, equal thread names by default. @llgs_test @dwarf_test def test_qThreadStopInfo_has_valid_thread_names_llgs_dwarf(self): Index: test/types/HideTestFailures.py =================================================================== --- test/types/HideTestFailures.py +++ test/types/HideTestFailures.py @@ -39,7 +39,7 @@ # Call super's tearDown(). TestBase.tearDown(self) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_char_type_with_dsym(self): """Test that char-type variables are displayed correctly.""" d = {'CXX_SOURCES': 'char.cpp'} @@ -54,7 +54,7 @@ self.setTearDownCleanup(dictionary=d) self.char_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_short_type_with_dsym(self): """Test that short-type variables are displayed correctly.""" d = {'CXX_SOURCES': 'short.cpp'} @@ -69,7 +69,7 @@ self.setTearDownCleanup(dictionary=d) self.short_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_int_type_with_dsym(self): """Test that int-type variables are displayed correctly.""" d = {'CXX_SOURCES': 'int.cpp'} @@ -84,7 +84,7 @@ self.setTearDownCleanup(dictionary=d) self.int_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_long_type_with_dsym(self): """Test that long-type variables are displayed correctly.""" d = {'CXX_SOURCES': 'long.cpp'} @@ -100,7 +100,7 @@ self.setTearDownCleanup(dictionary=d) self.long_type() - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin def test_long_long_type_with_dsym(self): """Test that 'long long'-type variables are displayed correctly.""" d = {'CXX_SOURCES': 'long_long.cpp'} Index: test/types/TestFloatTypes.py =================================================================== --- test/types/TestFloatTypes.py +++ test/types/TestFloatTypes.py @@ -6,7 +6,7 @@ import unittest2 import lldb import sys -from lldbtest import dsym_test, dwarf_test +from lldbtest import * class FloatTypesTestCase(AbstractBase.GenericTester): @@ -19,13 +19,13 @@ 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_float_type_with_dsym(self): """Test that float-type variables are displayed correctly.""" self.build_and_run('float.cpp', set(['float'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_float_type_from_block_with_dsym(self): """Test that float-type variables are displayed correctly from a block.""" @@ -36,13 +36,13 @@ """Test that float-type variables are displayed correctly.""" self.build_and_run('float.cpp', set(['float']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_double_type_with_dsym(self): """Test that double-type variables are displayed correctly.""" self.build_and_run('double.cpp', set(['double'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_double_type_from_block_with_dsym(self): """Test that double-type variables are displayed correctly from a block.""" Index: test/types/TestFloatTypesExpr.py =================================================================== --- test/types/TestFloatTypesExpr.py +++ test/types/TestFloatTypesExpr.py @@ -6,7 +6,7 @@ import unittest2 import lldb import sys -from lldbtest import dsym_test, dwarf_test +from lldbtest import * class FloatTypesExprTestCase(AbstractBase.GenericTester): @@ -22,13 +22,13 @@ 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_float_type_with_dsym(self): """Test that float-type variable expressions are evaluated correctly.""" self.build_and_run_expr('float.cpp', set(['float'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_float_type_from_block_with_dsym(self): """Test that float-type variables are displayed correctly from a block.""" @@ -39,13 +39,13 @@ """Test that float-type variable expressions are evaluated correctly.""" self.build_and_run_expr('float.cpp', set(['float']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_double_type_with_dsym(self): """Test that double-type variable expressions are evaluated correctly.""" self.build_and_run_expr('double.cpp', set(['double'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_double_type_from_block_with_dsym(self): """Test that double-type variables are displayed correctly from a block.""" Index: test/types/TestIntegerTypes.py =================================================================== --- test/types/TestIntegerTypes.py +++ test/types/TestIntegerTypes.py @@ -6,7 +6,7 @@ import unittest2 import lldb import sys -from lldbtest import dsym_test, dwarf_test +from lldbtest import * class IntegerTypesTestCase(AbstractBase.GenericTester): @@ -19,13 +19,13 @@ 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_char_type_with_dsym(self): """Test that char-type variables are displayed correctly.""" self.build_and_run('char.cpp', set(['char']), qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_char_type_from_block_with_dsym(self): """Test that char-type variables are displayed correctly from a block.""" @@ -36,13 +36,13 @@ """Test that char-type variables are displayed correctly.""" self.build_and_run('char.cpp', set(['char']), dsym=False, qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_char_type_with_dsym(self): """Test that 'unsigned_char'-type variables are displayed correctly.""" self.build_and_run('unsigned_char.cpp', set(['unsigned', 'char']), qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_char_type_from_block_with_dsym(self): """Test that 'unsigned char'-type variables are displayed correctly from a block.""" @@ -53,13 +53,13 @@ """Test that 'unsigned char'-type variables are displayed correctly.""" self.build_and_run('unsigned_char.cpp', set(['unsigned', 'char']), dsym=False, qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_short_type_with_dsym(self): """Test that short-type variables are displayed correctly.""" self.build_and_run('short.cpp', set(['short'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_short_type_from_block_with_dsym(self): """Test that short-type variables are displayed correctly from a block.""" @@ -70,13 +70,13 @@ """Test that short-type variables are displayed correctly.""" self.build_and_run('short.cpp', set(['short']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_short_type_with_dsym(self): """Test that 'unsigned_short'-type variables are displayed correctly.""" self.build_and_run('unsigned_short.cpp', set(['unsigned', 'short'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_short_type_from_block_with_dsym(self): """Test that 'unsigned short'-type variables are displayed correctly from a block.""" @@ -87,13 +87,13 @@ """Test that 'unsigned short'-type variables are displayed correctly.""" self.build_and_run('unsigned_short.cpp', set(['unsigned', 'short']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_int_type_with_dsym(self): """Test that int-type variables are displayed correctly.""" self.build_and_run('int.cpp', set(['int'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_int_type_from_block_with_dsym(self): """Test that int-type variables are displayed correctly from a block.""" @@ -104,13 +104,13 @@ """Test that int-type variables are displayed correctly.""" self.build_and_run('int.cpp', set(['int']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_int_type_with_dsym(self): """Test that 'unsigned_int'-type variables are displayed correctly.""" self.build_and_run('unsigned_int.cpp', set(['unsigned', 'int'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_int_type_from_block_with_dsym(self): """Test that 'unsigned int'-type variables are displayed correctly from a block.""" @@ -121,13 +121,13 @@ """Test that 'unsigned int'-type variables are displayed correctly.""" self.build_and_run('unsigned_int.cpp', set(['unsigned', 'int']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_type_with_dsym(self): """Test that long-type variables are displayed correctly.""" self.build_and_run('long.cpp', set(['long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_type_from_block_with_dsym(self): """Test that long-type variables are displayed correctly from a block.""" @@ -138,13 +138,13 @@ """Test that long-type variables are displayed correctly.""" self.build_and_run('long.cpp', set(['long']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_type_with_dsym(self): """Test that 'unsigned long'-type variables are displayed correctly.""" self.build_and_run('unsigned_long.cpp', set(['unsigned', 'long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_type_from_block_with_dsym(self): """Test that 'unsigned_long'-type variables are displayed correctly from a block.""" @@ -158,13 +158,13 @@ # rdar://problem/8482903 # test suite failure for types dir -- "long long" and "unsigned long long" - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_long_type_with_dsym(self): """Test that 'long long'-type variables are displayed correctly.""" self.build_and_run('long_long.cpp', set(['long long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_long_type_from_block_with_dsym(self): """Test that 'long_long'-type variables are displayed correctly from a block.""" @@ -175,13 +175,13 @@ """Test that 'long long'-type variables are displayed correctly.""" self.build_and_run('long_long.cpp', set(['long long']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_long_type_with_dsym(self): """Test that 'unsigned long long'-type variables are displayed correctly.""" self.build_and_run('unsigned_long_long.cpp', set(['unsigned', 'long long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_long_type_from_block_with_dsym(self): """Test that 'unsigned_long_long'-type variables are displayed correctly from a block.""" Index: test/types/TestIntegerTypesExpr.py =================================================================== --- test/types/TestIntegerTypesExpr.py +++ test/types/TestIntegerTypesExpr.py @@ -6,7 +6,7 @@ import unittest2 import lldb import sys -from lldbtest import dsym_test, dwarf_test +from lldbtest import * class IntegerTypesExprTestCase(AbstractBase.GenericTester): @@ -19,13 +19,13 @@ 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_char_type_with_dsym(self): """Test that char-type variable expressions are evaluated correctly.""" self.build_and_run_expr('char.cpp', set(['char']), qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_char_type_from_block_with_dsym(self): """Test that char-type variables are displayed correctly from a block.""" @@ -36,13 +36,13 @@ """Test that char-type variable expressions are evaluated correctly.""" self.build_and_run_expr('char.cpp', set(['char']), dsym=False, qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_char_type_with_dsym(self): """Test that 'unsigned_char'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_char.cpp', set(['unsigned', 'char']), qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_char_type_from_block_with_dsym(self): """Test that 'unsigned char'-type variables are displayed correctly from a block.""" @@ -53,13 +53,13 @@ """Test that 'unsigned char'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_char.cpp', set(['unsigned', 'char']), dsym=False, qd=True) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_short_type_with_dsym(self): """Test that short-type variable expressions are evaluated correctly.""" self.build_and_run_expr('short.cpp', set(['short'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_short_type_from_block_with_dsym(self): """Test that short-type variables are displayed correctly from a block.""" @@ -70,13 +70,13 @@ """Test that short-type variable expressions are evaluated correctly.""" self.build_and_run_expr('short.cpp', set(['short']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_short_type_with_dsym(self): """Test that 'unsigned_short'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_short.cpp', set(['unsigned', 'short'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_short_type_from_block_with_dsym(self): """Test that 'unsigned short'-type variables are displayed correctly from a block.""" @@ -87,13 +87,13 @@ """Test that 'unsigned short'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_short.cpp', set(['unsigned', 'short']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_int_type_with_dsym(self): """Test that int-type variable expressions are evaluated correctly.""" self.build_and_run_expr('int.cpp', set(['int'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_int_type_from_block_with_dsym(self): """Test that int-type variables are displayed correctly from a block.""" @@ -104,13 +104,13 @@ """Test that int-type variable expressions are evaluated correctly.""" self.build_and_run_expr('int.cpp', set(['int']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_int_type_with_dsym(self): """Test that 'unsigned_int'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_int.cpp', set(['unsigned', 'int'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_int_type_from_block_with_dsym(self): """Test that 'unsigned int'-type variables are displayed correctly from a block.""" @@ -121,13 +121,13 @@ """Test that 'unsigned int'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_int.cpp', set(['unsigned', 'int']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_type_with_dsym(self): """Test that long-type variable expressions are evaluated correctly.""" self.build_and_run_expr('long.cpp', set(['long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_type_from_block_with_dsym(self): """Test that long-type variables are displayed correctly from a block.""" @@ -138,13 +138,13 @@ """Test that long-type variable expressions are evaluated correctly.""" self.build_and_run_expr('long.cpp', set(['long']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_type_with_dsym(self): """Test that 'unsigned long'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_long.cpp', set(['unsigned', 'long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_type_from_block_with_dsym(self): """Test that 'unsigned_long'-type variables are displayed correctly from a block.""" @@ -158,13 +158,13 @@ # rdar://problem/8482903 # test suite failure for types dir -- "long long" and "unsigned long long" - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_long_type_with_dsym(self): """Test that 'long long'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('long_long.cpp', set(['long long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_long_long_type_from_block_with_dsym(self): """Test that 'long_long'-type variables are displayed correctly from a block.""" @@ -175,13 +175,13 @@ """Test that 'long long'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('long_long.cpp', set(['long long']), dsym=False) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_long_type_with_dsym(self): """Test that 'unsigned long long'-type variable expressions are evaluated correctly.""" self.build_and_run_expr('unsigned_long_long.cpp', set(['unsigned', 'long long'])) - @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @skipUnlessDarwin @dsym_test def test_unsigned_long_long_type_from_block_with_dsym(self): """Test that 'unsigned_long_long'-type variables are displayed correctly from a block.""" Index: test/warnings/uuid/TestAddDsymCommand.py =================================================================== --- test/warnings/uuid/TestAddDsymCommand.py +++ test/warnings/uuid/TestAddDsymCommand.py @@ -5,7 +5,7 @@ import lldb from lldbtest import * -@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") +@skipUnlessDarwin class AddDsymCommandCase(TestBase): mydir = TestBase.compute_mydir(__file__)