[Lldb-commits] [lldb] r233547 - Replace sys.platform skips in tests with @skip decorators which check against remote platform.

Mon Mar 30 07:12:21 PDT 2015

Author: flackr
Date: Mon Mar 30 09:12:17 2015
New Revision: 233547

URL: http://llvm.org/viewvc/llvm-project?rev=233547&view=rev
Log:
Replace sys.platform skips in tests with @skip decorators which check against remote platform.

Adds @skipIfPlatform and @skipUnlessPlatform decorators which will skip if /
unless the target platform is in the provided platform list.

Test Plan:
ninja check-lldb shows no regressions.
When running cross platform, tests which cannot run on the target platform are
skipped.

Differential Revision: http://reviews.llvm.org/D8665

Modified:
    lldb/trunk/test/benchmarks/continue/TestBenchmarkContinue.py
    lldb/trunk/test/driver/batch_mode/TestBatchMode.py
    lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py
    lldb/trunk/test/expression_command/call-function/TestCallStopAndContinue.py
    lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py
    lldb/trunk/test/expression_command/call-throws/TestCallThatThrows.py
    lldb/trunk/test/expression_command/formatters/TestFormatters.py
    lldb/trunk/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
    lldb/trunk/test/expression_command/po_verbosity/TestPoVerbosity.py
    lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py
    lldb/trunk/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
    lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py
    lldb/trunk/test/functionalities/alias/TestAliases.py
    lldb/trunk/test/functionalities/asan/TestMemoryHistory.py
    lldb/trunk/test/functionalities/asan/TestReportData.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
    lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
    lldb/trunk/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py
    lldb/trunk/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
    lldb/trunk/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
    lldb/trunk/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
    lldb/trunk/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
    lldb/trunk/test/functionalities/command_script/TestCommandScript.py
    lldb/trunk/test/functionalities/conditional_break/TestConditionalBreak.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
    lldb/trunk/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
    lldb/trunk/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
    lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
    lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py
    lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py
    lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py
    lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py
    lldb/trunk/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py
    lldb/trunk/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py
    lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py
    lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py
    lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py
    lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py
    lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
    lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
    lldb/trunk/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py
    lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py
    lldb/trunk/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
    lldb/trunk/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
    lldb/trunk/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
    lldb/trunk/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
    lldb/trunk/test/functionalities/dead-strip/TestDeadStrip.py
    lldb/trunk/test/functionalities/disassembly/TestDisassembleBreakpoint.py
    lldb/trunk/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
    lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
    lldb/trunk/test/functionalities/exec/TestExec.py
    lldb/trunk/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
    lldb/trunk/test/functionalities/fat_archives/TestFatArchives.py
    lldb/trunk/test/functionalities/inferior-assert/TestInferiorAssert.py
    lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py
    lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py
    lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
    lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
    lldb/trunk/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
    lldb/trunk/test/functionalities/memory/read/TestMemoryRead.py
    lldb/trunk/test/functionalities/nosucharch/TestNoSuchArch.py
    lldb/trunk/test/functionalities/paths/TestPaths.py
    lldb/trunk/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
    lldb/trunk/test/functionalities/process_attach/TestProcessAttach.py
    lldb/trunk/test/functionalities/process_launch/TestProcessLaunch.py
    lldb/trunk/test/functionalities/recursion/TestValueObjectRecursion.py
    lldb/trunk/test/functionalities/rerun/TestRerun.py
    lldb/trunk/test/functionalities/return-value/TestReturnValue.py
    lldb/trunk/test/functionalities/set-data/TestSetData.py
    lldb/trunk/test/functionalities/signal/TestSendSignal.py
    lldb/trunk/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
    lldb/trunk/test/functionalities/stop-hook/TestStopHookCmd.py
    lldb/trunk/test/functionalities/stop-hook/TestStopHookMechanism.py
    lldb/trunk/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
    lldb/trunk/test/functionalities/target_command/TestTargetCommand.py
    lldb/trunk/test/functionalities/thread/TestNumThreads.py
    lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
    lldb/trunk/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
    lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
    lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
    lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
    lldb/trunk/test/functionalities/thread/jump/TestThreadJump.py
    lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
    lldb/trunk/test/functionalities/thread/state/TestThreadStates.py
    lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py
    lldb/trunk/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
    lldb/trunk/test/functionalities/tty/TestTerminal.py
    lldb/trunk/test/functionalities/type_completion/TestTypeCompletion.py
    lldb/trunk/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
    lldb/trunk/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
    lldb/trunk/test/functionalities/value_md5_crash/TestValueMD5Crash.py
    lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
    lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
    lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
    lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
    lldb/trunk/test/lang/c/bitfields/TestBitfields.py
    lldb/trunk/test/lang/c/enum_types/TestEnumTypes.py
    lldb/trunk/test/lang/c/forward/TestForwardDeclaration.py
    lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
    lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py
    lldb/trunk/test/lang/c/set_values/TestSetValues.py
    lldb/trunk/test/lang/c/stepping/TestStepAndBreakpoints.py
    lldb/trunk/test/lang/c/stepping/TestThreadStepping.py
    lldb/trunk/test/lang/c/strings/TestCStrings.py
    lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py
    lldb/trunk/test/lang/cpp/bool/TestCPPBool.py
    lldb/trunk/test/lang/cpp/breakpoints/TestCPPBreakpoints.py
    lldb/trunk/test/lang/cpp/call-function/TestCallCPPFunction.py
    lldb/trunk/test/lang/cpp/char1632_t/TestChar1632T.py
    lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
    lldb/trunk/test/lang/cpp/class_types/TestClassTypes.py
    lldb/trunk/test/lang/cpp/class_types/TestClassTypesDisassembly.py
    lldb/trunk/test/lang/cpp/diamond/TestDiamond.py
    lldb/trunk/test/lang/cpp/dynamic-value/TestCppValueCast.py
    lldb/trunk/test/lang/cpp/dynamic-value/TestDynamicValue.py
    lldb/trunk/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
    lldb/trunk/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
    lldb/trunk/test/lang/cpp/namespace/TestNamespace.py
    lldb/trunk/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
    lldb/trunk/test/lang/cpp/rdar12991846/TestRdar12991846.py
    lldb/trunk/test/lang/cpp/rvalue-references/TestRvalueReferences.py
    lldb/trunk/test/lang/cpp/signed_types/TestSignedTypes.py
    lldb/trunk/test/lang/cpp/static_members/TestCPPStaticMembers.py
    lldb/trunk/test/lang/cpp/static_methods/TestCPPStaticMethods.py
    lldb/trunk/test/lang/cpp/stl/TestSTL.py
    lldb/trunk/test/lang/cpp/this/TestCPPThis.py
    lldb/trunk/test/lang/cpp/unique-types/TestUniqueTypes.py
    lldb/trunk/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
    lldb/trunk/test/lang/cpp/virtual/TestVirtual.py
    lldb/trunk/test/lang/cpp/wchar_t/TestCxxWCharT.py
    lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
    lldb/trunk/test/lang/objc/forward-decl/TestForwardDecl.py
    lldb/trunk/test/lang/objc/foundation/TestConstStrings.py
    lldb/trunk/test/lang/objc/foundation/TestFoundationDisassembly.py
    lldb/trunk/test/lang/objc/foundation/TestObjCMethods.py
    lldb/trunk/test/lang/objc/foundation/TestObjCMethods2.py
    lldb/trunk/test/lang/objc/foundation/TestObjectDescriptionAPI.py
    lldb/trunk/test/lang/objc/foundation/TestRuntimeTypes.py
    lldb/trunk/test/lang/objc/foundation/TestSymbolTable.py
    lldb/trunk/test/lang/objc/hidden-ivars/TestHiddenIvars.py
    lldb/trunk/test/lang/objc/objc++/TestObjCXX.py
    lldb/trunk/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
    lldb/trunk/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
    lldb/trunk/test/lang/objc/objc-checker/TestObjCCheckers.py
    lldb/trunk/test/lang/objc/objc-class-method/TestObjCClassMethod.py
    lldb/trunk/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
    lldb/trunk/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
    lldb/trunk/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
    lldb/trunk/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
    lldb/trunk/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
    lldb/trunk/test/lang/objc/objc-optimized/TestObjcOptimized.py
    lldb/trunk/test/lang/objc/objc-property/TestObjCProperty.py
    lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
    lldb/trunk/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
    lldb/trunk/test/lang/objc/objc-stepping/TestObjCStepping.py
    lldb/trunk/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
    lldb/trunk/test/lang/objc/objc-super/TestObjCSuper.py
    lldb/trunk/test/lang/objc/print-obj/TestPrintObj.py
    lldb/trunk/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
    lldb/trunk/test/lang/objc/rdar-10967107/TestRdar10967107.py
    lldb/trunk/test/lang/objc/rdar-11355592/TestRdar11355592.py
    lldb/trunk/test/lang/objc/rdar-12408181/TestRdar12408181.py
    lldb/trunk/test/lang/objc/real-definition/TestRealDefinition.py
    lldb/trunk/test/lang/objc/self/TestObjCSelf.py
    lldb/trunk/test/linux/builtin_trap/TestBuiltinTrap.py
    lldb/trunk/test/lldbinline.py
    lldb/trunk/test/lldbtest.py
    lldb/trunk/test/logging/TestLogging.py
    lldb/trunk/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
    lldb/trunk/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
    lldb/trunk/test/macosx/indirect_symbol/TestIndirectSymbols.py
    lldb/trunk/test/macosx/order/TestOrderFile.py
    lldb/trunk/test/macosx/queues/TestQueues.py
    lldb/trunk/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
    lldb/trunk/test/macosx/universal/TestUniversal.py
    lldb/trunk/test/python_api/breakpoint/TestBreakpointAPI.py
    lldb/trunk/test/python_api/class_members/TestSBTypeClassMembers.py
    lldb/trunk/test/python_api/event/TestEvents.py
    lldb/trunk/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
    lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py
    lldb/trunk/test/python_api/frame/TestFrames.py
    lldb/trunk/test/python_api/frame/inlines/TestInlinedFrame.py
    lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py
    lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py
    lldb/trunk/test/python_api/hello_world/TestHelloWorld.py
    lldb/trunk/test/python_api/interpreter/TestCommandInterpreterAPI.py
    lldb/trunk/test/python_api/objc_type/TestObjCType.py
    lldb/trunk/test/python_api/process/TestProcessAPI.py
    lldb/trunk/test/python_api/process/io/TestProcessIO.py
    lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py
    lldb/trunk/test/python_api/sbdata/TestSBData.py
    lldb/trunk/test/python_api/sbvalue_persist/TestSBValuePersist.py
    lldb/trunk/test/python_api/section/TestSectionAPI.py
    lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py
    lldb/trunk/test/python_api/target/TestTargetAPI.py
    lldb/trunk/test/python_api/thread/TestThreadAPI.py
    lldb/trunk/test/python_api/type/TestTypeList.py
    lldb/trunk/test/python_api/value/TestValueAPI.py
    lldb/trunk/test/python_api/value/change_values/TestChangeValueAPI.py
    lldb/trunk/test/python_api/value/linked_list/TestValueAPILinkedList.py
    lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py
    lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py
    lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
    lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py
    lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
    lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
    lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
    lldb/trunk/test/settings/TestSettings.py
    lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py
    lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
    lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
    lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
    lldb/trunk/test/types/HideTestFailures.py
    lldb/trunk/test/types/TestFloatTypes.py
    lldb/trunk/test/types/TestFloatTypesExpr.py
    lldb/trunk/test/types/TestIntegerTypes.py
    lldb/trunk/test/types/TestIntegerTypesExpr.py
    lldb/trunk/test/warnings/uuid/TestAddDsymCommand.py

Modified: lldb/trunk/test/benchmarks/continue/TestBenchmarkContinue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/benchmarks/continue/TestBenchmarkContinue.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================

--- lldb/trunk/test/benchmarks/continue/TestBenchmarkContinue.py (original)
+++ lldb/trunk/test/benchmarks/continue/TestBenchmarkContinue.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class TestBenchmarkContinue(BenchBase):
     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"""

Modified: lldb/trunk/test/driver/batch_mode/TestBatchMode.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/driver/batch_mode/TestBatchMode.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/driver/batch_mode/TestBatchMode.py (original)
+++ lldb/trunk/test/driver/batch_mode/TestBatchMode.py Mon Mar 30 09:12:17 2015
@@ -15,7 +15,7 @@ class DriverBatchModeTest (TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @unittest2.expectedFailure("<rdar://problem/18684124>, lldb doesn't reliably print the prompt when run under pexpect")
     @dsym_test
     def test_driver_batch_mode_with_dsym(self):

Modified: lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py (original)
+++ lldb/trunk/test/expression_command/call-function/TestCallStdStringFunction.py Mon Mar 30 09:12:17 2015
@@ -18,7 +18,7 @@ class ExprCommandCallFunctionTestCase(Te
         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) # <rdar://problem/16361880>, we get the result correctly, but fail to invoke the Summary formatter.
     def test_with_dsym(self):

Modified: lldb/trunk/test/expression_command/call-function/TestCallStopAndContinue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-function/TestCallStopAndContinue.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/call-function/TestCallStopAndContinue.py (original)
+++ lldb/trunk/test/expression_command/call-function/TestCallStopAndContinue.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class ExprCommandCallStopContinueTestCas
         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):

Modified: lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py (original)
+++ lldb/trunk/test/expression_command/call-restarts/TestCallThatRestarts.py Mon Mar 30 09:12:17 2015
@@ -19,7 +19,7 @@ class ExprCommandThatRestartsTestCase(Te
         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):

Modified: lldb/trunk/test/expression_command/call-throws/TestCallThatThrows.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/call-throws/TestCallThatThrows.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/call-throws/TestCallThatThrows.py (original)
+++ lldb/trunk/test/expression_command/call-throws/TestCallThatThrows.py Mon Mar 30 09:12:17 2015
@@ -19,14 +19,14 @@ class ExprCommandWithThrowTestCase(TestB
         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."""

Modified: lldb/trunk/test/expression_command/formatters/TestFormatters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/formatters/TestFormatters.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/formatters/TestFormatters.py (original)
+++ lldb/trunk/test/expression_command/formatters/TestFormatters.py Mon Mar 30 09:12:17 2015
@@ -18,7 +18,7 @@ class ExprFormattersTestCase(TestBase):
         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."""

Modified: lldb/trunk/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py (original)
+++ lldb/trunk/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py Mon Mar 30 09:12:17 2015
@@ -17,14 +17,14 @@ class PersistObjCPointeeType(TestBase):
         # 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"""

Modified: lldb/trunk/test/expression_command/po_verbosity/TestPoVerbosity.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/po_verbosity/TestPoVerbosity.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/po_verbosity/TestPoVerbosity.py (original)
+++ lldb/trunk/test/expression_command/po_verbosity/TestPoVerbosity.py Mon Mar 30 09:12:17 2015
@@ -18,14 +18,14 @@ class PoVerbosityTestCase(TestBase):
         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."""

Modified: lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py (original)
+++ lldb/trunk/test/expression_command/timeout/TestCallWithTimeout.py Mon Mar 30 09:12:17 2015
@@ -19,7 +19,7 @@ class ExprCommandWithTimeoutsTestCase(Te
         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."""

Modified: lldb/trunk/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py (original)
+++ lldb/trunk/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py Mon Mar 30 09:12:17 2015
@@ -20,14 +20,14 @@ class ObjCTypeQueryTestCase(TestBase):
         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."""

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class AbbreviationsTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureFreeBSD("llvm.org/pr22611 thread race condition breaks prompt setting")
-    @unittest2.skipIf(sys.platform.startswith("win32"), "one-shot script commands deadlock on Windows.")
+    @skipIfWindows # one-shot script commands deadlock on Windows.
     def test_nonrunning_command_abbreviations (self):
         self.expect("ap script",
                     startstr = "The following built-in commands may relate to 'script':",
@@ -78,7 +78,7 @@ class AbbreviationsTestCase(TestBase):
         self.runCmd (r'''sc print "\n\n\tHello!\n"''')
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestCommonShortSpellings.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class CommonShortSpellingsTestCase(TestB
     
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/alias/TestAliases.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/alias/TestAliases.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/alias/TestAliases.py (original)
+++ lldb/trunk/test/functionalities/alias/TestAliases.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class AliasTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/asan/TestMemoryHistory.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/asan/TestMemoryHistory.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/asan/TestMemoryHistory.py (original)
+++ lldb/trunk/test/functionalities/asan/TestMemoryHistory.py Mon Mar 30 09:12:17 2015
@@ -19,7 +19,7 @@ class AsanTestCase(TestBase):
     @dsym_test
     @skipIfRemote
     @skipUnlessCompilerRt
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_with_dsym (self):
         compiler = self.findBuiltClang ()
         self.buildDsym (None, compiler)

Modified: lldb/trunk/test/functionalities/asan/TestReportData.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/asan/TestReportData.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/asan/TestReportData.py (original)
+++ lldb/trunk/test/functionalities/asan/TestReportData.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class AsanTestReportDataCase(TestBase):
     @dsym_test
     @skipIfRemote
     @skipUnlessCompilerRt
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_with_dsym (self):
         compiler = self.findBuiltClang ()
         self.buildDsym (None, compiler)

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py Mon Mar 30 09:12:17 2015
@@ -18,7 +18,7 @@ class BreakpointCommandTestCase(TestBase
         cls.RemoveTempFile("output.txt")
         cls.RemoveTempFile("output2.txt")
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test a sequence of breakpoint command add, list, and delete."""

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class PythonBreakpointCommandSettingTest
     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):

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class RegexpBreakCommandTestCase(TestBas
 
     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."""

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py Mon Mar 30 09:12:17 2015
@@ -12,21 +12,21 @@ class BreakpointConditionsTestCase(TestB
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_breakpoint_condition_with_dsym_and_run_command(self):
         """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
         self.buildDsym()
         self.breakpoint_conditions()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_breakpoint_condition_inline_with_dsym_and_run_command(self):
         """Exercise breakpoint condition inline with 'breakpoint set'."""
         self.buildDsym()
         self.breakpoint_conditions(inline=True)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_breakpoint_condition_with_dsym_and_python_api(self):
@@ -35,14 +35,14 @@ class BreakpointConditionsTestCase(TestB
         self.breakpoint_conditions_python()
 
     @dwarf_test
-    @unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)")
+    @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
     def test_breakpoint_condition_with_dwarf_and_run_command(self):
         """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
         self.buildDwarf()
         self.breakpoint_conditions()
 
     @dwarf_test
-    @unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)")
+    @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
     def test_breakpoint_condition_inline_with_dwarf_and_run_command(self):
         """Exercise breakpoint condition inline with 'breakpoint set'."""
         self.buildDwarf()
@@ -50,7 +50,7 @@ class BreakpointConditionsTestCase(TestB
 
     @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()

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class BreakpointIDTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py Mon Mar 30 09:12:17 2015
@@ -12,14 +12,14 @@ class BreakpointIgnoreCountTestCase(Test
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Exercise breakpoint ignore count with 'breakpoint set -i <count>'."""
         self.buildDsym()
         self.breakpoint_ignore_count()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):

Modified: lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class BreakpointLocationsTestCase(TestBa
 
     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."""

Modified: lldb/trunk/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/cpp/TestCPPBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class TestCPPBreakpoints(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class TestCPPExceptionBreakpoint (TestBa
     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):

Modified: lldb/trunk/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class BreakpointInDummyTarget (TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test breakpoint set before we have a target. """

Modified: lldb/trunk/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class InlinedBreakpointsTestCase(TestBas
 
     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)."""

Modified: lldb/trunk/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py (original)
+++ lldb/trunk/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ import lldbutil
 import shutil
 import subprocess
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class TestObjCBreakpoints(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/functionalities/command_script/TestCommandScript.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/command_script/TestCommandScript.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/command_script/TestCommandScript.py (original)
+++ lldb/trunk/test/functionalities/command_script/TestCommandScript.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class CmdPythonTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/conditional_break/TestConditionalBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/conditional_break/TestConditionalBreak.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/conditional_break/TestConditionalBreak.py (original)
+++ lldb/trunk/test/functionalities/conditional_break/TestConditionalBreak.py Mon Mar 30 09:12:17 2015
@@ -17,7 +17,7 @@ class ConditionalBreakTestCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_python(self):
@@ -32,7 +32,7 @@ class ConditionalBreakTestCase(TestBase)
         self.buildDwarf()
         self.do_conditional_break()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_command(self):
         """Simulate a user using lldb commands to break on c() if called from a()."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class AdvDataFormatterTestCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class CategoriesDataFormatterTestCase(Te
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class CppDataFormatterTestCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DataFormatterDisablingTestCase(Tes
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class EnumFormatTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class GlobalsDataFormatterTestCase(TestB
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class NamedSummariesDataFormatterTestCas
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py Mon Mar 30 09:12:17 2015
@@ -14,14 +14,14 @@ class ObjCDataFormatterTestCase(TestBase
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_plain_objc_with_dsym_and_run_command(self):
         """Test basic ObjC formatting behavior."""
         self.buildDsym()
         self.plain_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_plain_objc_with_dwarf_and_run_command(self):
         """Test basic ObjC formatting behavior."""
@@ -33,186 +33,186 @@ class ObjCDataFormatterTestCase(TestBase
         self.appkit_common_data_formatters_command()
         commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsnumber_with_dsym_and_run_command(self):
         """Test formatters for NSNumber."""
         self.appkit_tester_impl(self.buildDsym,self.nsnumber_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsnumber_with_dwarf_and_run_command(self):
         """Test formatters for NSNumber."""
         self.appkit_tester_impl(self.buildDwarf,self.nsnumber_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsstring_with_dsym_and_run_command(self):
         """Test formatters for NSString."""
         self.appkit_tester_impl(self.buildDsym,self.nsstring_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsstring_with_dwarf_and_run_command(self):
         """Test formatters for NSString."""
         self.appkit_tester_impl(self.buildDwarf,self.nsstring_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nscontainers_with_dsym_and_run_command(self):
         """Test formatters for NS container classes."""
         self.appkit_tester_impl(self.buildDsym,self.nscontainers_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nscontainers_with_dwarf_and_run_command(self):
         """Test formatters for  NS container classes."""
         self.appkit_tester_impl(self.buildDwarf,self.nscontainers_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsdata_with_dsym_and_run_command(self):
         """Test formatters for NSData."""
         self.appkit_tester_impl(self.buildDsym,self.nsdata_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsdata_with_dwarf_and_run_command(self):
         """Test formatters for  NSData."""
         self.appkit_tester_impl(self.buildDwarf,self.nsdata_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsurl_with_dsym_and_run_command(self):
         """Test formatters for NSURL."""
         self.appkit_tester_impl(self.buildDsym,self.nsurl_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsurl_with_dwarf_and_run_command(self):
         """Test formatters for NSURL."""
         self.appkit_tester_impl(self.buildDwarf,self.nsurl_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nserror_with_dsym_and_run_command(self):
         """Test formatters for NSError."""
         self.appkit_tester_impl(self.buildDsym,self.nserror_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nserror_with_dwarf_and_run_command(self):
         """Test formatters for NSError."""
         self.appkit_tester_impl(self.buildDwarf,self.nserror_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsbundle_with_dsym_and_run_command(self):
         """Test formatters for NSBundle."""
         self.appkit_tester_impl(self.buildDsym,self.nsbundle_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsbundle_with_dwarf_and_run_command(self):
         """Test formatters for NSBundle."""
         self.appkit_tester_impl(self.buildDwarf,self.nsbundle_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsexception_with_dsym_and_run_command(self):
         """Test formatters for NSException."""
         self.appkit_tester_impl(self.buildDsym,self.nsexception_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsexception_with_dwarf_and_run_command(self):
         """Test formatters for NSException."""
         self.appkit_tester_impl(self.buildDwarf,self.nsexception_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsmisc_with_dsym_and_run_command(self):
         """Test formatters for misc NS classes."""
         self.appkit_tester_impl(self.buildDsym,self.nsmisc_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsmisc_with_dwarf_and_run_command(self):
         """Test formatters for misc NS classes."""
         self.appkit_tester_impl(self.buildDwarf,self.nsmisc_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_nsdate_with_dsym_and_run_command(self):
         """Test formatters for NSDate."""
         self.appkit_tester_impl(self.buildDsym,self.nsdate_data_formatter_commands)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_nsdate_with_dwarf_and_run_command(self):
         """Test formatters for NSDate."""
         self.appkit_tester_impl(self.buildDwarf,self.nsdate_data_formatter_commands)
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_coreframeworks_with_dsym_and_run_command(self):
         """Test formatters for Core OSX frameworks."""
         self.buildDsym()
         self.cf_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_coreframeworks_with_dwarf_and_run_command(self):
         """Test formatters for Core OSX frameworks."""
         self.buildDwarf()
         self.cf_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_kvo_with_dsym_and_run_command(self):
         """Test the behavior of formatters when KVO is in use."""
         self.buildDsym()
         self.kvo_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_kvo_with_dwarf_and_run_command(self):
         """Test the behavior of formatters when KVO is in use."""
         self.buildDwarf()
         self.kvo_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_rdar11106605_with_dsym_and_run_command(self):
         """Check that Unicode characters come out of CFString summary correctly."""
         self.buildDsym()
         self.rdar11106605_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_rdar11106605_with_dwarf_and_run_command(self):
         """Check that Unicode characters come out of CFString summary correctly."""
         self.buildDwarf()
         self.rdar11106605_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_expr_with_dsym_and_run_command(self):
         """Test common cases of expression parser <--> formatters interaction."""
         self.buildDsym()
         self.expr_objc_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_expr_with_dwarf_and_run_command(self):
         """Test common cases of expression parser <--> formatters interaction."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class PythonSynthDataFormatterTestCase(T
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""
@@ -26,7 +26,7 @@ class PythonSynthDataFormatterTestCase(T
         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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ScriptDataFormatterTestCase(TestBa
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class SkipSummaryDataFormatterTestCase(T
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class SmartArrayDataFormatterTestCase(Te
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxIteratorDataFormatterTestCas
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxListDataFormatterTestCase(Te
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxMapDataFormatterTestCase(Tes
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxMultiMapDataFormatterTestCas
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxMultiSetDataFormatterTestCas
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxSetDataFormatterTestCase(Tes
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class LibcxxStringDataFormatterTestCase(
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxMultiMapDataFormatterTestCas
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxVBoolDataFormatterTestCase(T
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class LibcxxVectorDataFormatterTestCase(
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class StdIteratorDataFormatterTestCase(T
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class StdListDataFormatterTestCase(TestB
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class StdMapDataFormatterTestCase(TestBa
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class StdStringDataFormatterTestCase(Tes
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class StdVBoolDataFormatterTestCase(Test
 
     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):

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class StdVectorDataFormatterTestCase(Tes
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class SynthDataFormatterTestCase(TestBas
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DataFormatterSynthValueTestCase(Te
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class FormatPropagationTestCase(TestBase
     mydir = TestBase.compute_mydir(__file__)
 
     # rdar://problem/14035604
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Check if changing Format on an SBValue correctly propagates that new format to children as it should"""

Modified: lldb/trunk/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class FrameFormatSmallStructTestCase(Tes
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class PtrRef2TypedefTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test data formatter commands."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Radar10449092DataFormatterTestCase
     # 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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class Radar10642615DataFormatterTestCase
     # 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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Rdar10887661TestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     # rdar://problem/10887661
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Check for an issue where capping does not work because the Target pointer appears to be changing behind our backs."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterRdar11086338TestCase(
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterOSTypeTestCase(TestBa
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterBoolRefPtr(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_boolrefptr_with_dsym_and_run_command(self):
         """Test the formatters we use for BOOL& and BOOL* in Objective-C."""
         self.buildDsym()
         self.boolrefptr_data_formatter_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_boolrefptr_with_dwarf_and_run_command(self):
         """Test the formatters we use for BOOL& and BOOL* in Objective-C."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar%2011988289.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterRdar11988289TestCase(
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterRdar12437442TestCase(
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterRdar12529957TestCase(
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Radar13338477DataFormatterTestCase
     # 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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py Mon Mar 30 09:12:17 2015
@@ -13,14 +13,14 @@ class DataFormatterOneIsSingularTestCase
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Radar9973865DataFormatterTestCase(
     # 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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Radar9973992DataFormatterTestCase(
     # 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."""

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Radar9974002DataFormatterTestCase(
     # 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."""

Modified: lldb/trunk/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DataFormatterRefPtrRecursionTestCa
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class UserFormatVSSummaryTestCase(TestBa
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class PythonSynthDataFormatterTestCase(T
 
     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."""

Modified: lldb/trunk/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class VectorTypesFormattingTestCase(Test
     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"""

Modified: lldb/trunk/test/functionalities/dead-strip/TestDeadStrip.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/dead-strip/TestDeadStrip.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/dead-strip/TestDeadStrip.py (original)
+++ lldb/trunk/test/functionalities/dead-strip/TestDeadStrip.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DeadStripTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test breakpoint works correctly with dead-code stripping."""

Modified: lldb/trunk/test/functionalities/disassembly/TestDisassembleBreakpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/disassembly/TestDisassembleBreakpoint.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/disassembly/TestDisassembleBreakpoint.py (original)
+++ lldb/trunk/test/functionalities/disassembly/TestDisassembleBreakpoint.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DisassemblyTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym ()

Modified: lldb/trunk/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py (original)
+++ lldb/trunk/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DynamicValueChildCountTestCase(Tes
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     @expectedFailurei386("to be figured out")

Modified: lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py (original)
+++ lldb/trunk/test/functionalities/embedded_interpreter/TestConvenienceVariables.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class ConvenienceVariablesCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     @skipIfRemote
     def test_with_dsym_and_run_command(self):

Modified: lldb/trunk/test/functionalities/exec/TestExec.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/exec/TestExec.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/exec/TestExec.py (original)
+++ lldb/trunk/test/functionalities/exec/TestExec.py Mon Mar 30 09:12:17 2015
@@ -22,7 +22,7 @@ class ExecTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
         
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         if self.getArchitecture() == 'x86_64':
@@ -35,7 +35,7 @@ class ExecTestCase(TestBase):
         self.do_test ()
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_with_dwarf (self):
         if self.getArchitecture() == 'x86_64':

Modified: lldb/trunk/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py (original)
+++ lldb/trunk/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py Mon Mar 30 09:12:17 2015
@@ -15,7 +15,7 @@ class ExprDoesntDeadlockTestCase(TestBas
 
     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."""

Modified: lldb/trunk/test/functionalities/fat_archives/TestFatArchives.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/fat_archives/TestFatArchives.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/fat_archives/TestFatArchives.py (original)
+++ lldb/trunk/test/functionalities/fat_archives/TestFatArchives.py Mon Mar 30 09:12:17 2015
@@ -21,7 +21,7 @@ class FatArchiveTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_with_dwarf (self):
         if self.getArchitecture() == 'x86_64':

Modified: lldb/trunk/test/functionalities/inferior-assert/TestInferiorAssert.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-assert/TestInferiorAssert.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inferior-assert/TestInferiorAssert.py (original)
+++ lldb/trunk/test/functionalities/inferior-assert/TestInferiorAssert.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class AssertingInferiorTestCase(TestBase
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @unittest2.expectedFailure("rdar://15367233")
     def test_inferior_asserting_dsym(self):
         """Test that lldb reliably catches the inferior asserting (command)."""
@@ -24,7 +24,7 @@ class AssertingInferiorTestCase(TestBase
         self.buildDwarf()
         self.inferior_asserting()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_asserting_registers_dsym(self):
         """Test that lldb reliably reads registers from the inferior after asserting (command)."""
         self.buildDsym()
@@ -52,7 +52,7 @@ class AssertingInferiorTestCase(TestBase
         self.buildDefault()
         self.inferior_asserting_python()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @unittest2.expectedFailure("rdar://15367233")
     def test_inferior_asserting_expr_dsym(self):
         """Test that the lldb expression interpreter can read from the inferior after asserting (command)."""
@@ -67,7 +67,7 @@ class AssertingInferiorTestCase(TestBase
         self.buildDwarf()
         self.inferior_asserting_expr()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @unittest2.expectedFailure("rdar://15367233")
     def test_inferior_asserting_step_dsym(self):
         """Test that lldb functions correctly after stepping through a call to assert()."""

Modified: lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py (original)
+++ lldb/trunk/test/functionalities/inferior-changed/TestInferiorChanged.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class ChangedInferiorTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_dsym(self):
         """Test lldb reloads the inferior after it was changed during the session."""
         self.buildDsym()

Modified: lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py (original)
+++ lldb/trunk/test/functionalities/inferior-crashing/TestInferiorCrashing.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CrashingInferiorTestCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_dsym(self):
         """Test that lldb reliably catches the inferior crashing (command)."""
         self.buildDsym()
@@ -20,7 +20,7 @@ class CrashingInferiorTestCase(TestBase)
         self.buildDwarf()
         self.inferior_crashing()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_registers_dsym(self):
         """Test that lldb reliably reads registers from the inferior after crashing (command)."""
         self.buildDsym()
@@ -37,7 +37,7 @@ class CrashingInferiorTestCase(TestBase)
         self.buildDefault()
         self.inferior_crashing_python()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_expr_dsym(self):
         """Test that the lldb expression interpreter can read from the inferior after crashing (command)."""
         self.buildDsym()
@@ -48,7 +48,7 @@ class CrashingInferiorTestCase(TestBase)
         self.buildDwarf()
         self.inferior_crashing_expr()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_step_dsym(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.buildDsym()
@@ -59,7 +59,7 @@ class CrashingInferiorTestCase(TestBase)
         self.buildDwarf()
         self.inferior_crashing_step()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_step_after_break_dsym(self):
         """Test that stepping after a crash behaves correctly."""
         self.buildDsym()
@@ -72,7 +72,7 @@ class CrashingInferiorTestCase(TestBase)
         self.buildDwarf()
         self.inferior_crashing_step_after_break()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_inferior_crashing_expr_step_and_expr_dsym(self):
         """Test that lldb expressions work before and after stepping after a crash."""
         self.buildDsym()

Modified: lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py (original)
+++ lldb/trunk/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class CrashingRecursiveInferiorTestCase(
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_recursive_inferior_crashing_dsym(self):
         """Test that lldb reliably catches the inferior crashing (command)."""
         self.buildDsym()
@@ -21,7 +21,7 @@ class CrashingRecursiveInferiorTestCase(
         self.buildDwarf()
         self.recursive_inferior_crashing()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_recursive_inferior_crashing_registers_dsym(self):
         """Test that lldb reliably reads registers from the inferior after crashing (command)."""
         self.buildDsym()
@@ -38,7 +38,7 @@ class CrashingRecursiveInferiorTestCase(
         self.buildDefault()
         self.recursive_inferior_crashing_python()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_recursive_inferior_crashing_expr_dsym(self):
         """Test that the lldb expression interpreter can read from the inferior after crashing (command)."""
         self.buildDsym()
@@ -49,7 +49,7 @@ class CrashingRecursiveInferiorTestCase(
         self.buildDwarf()
         self.recursive_inferior_crashing_expr()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_recursive_inferior_crashing_step_dsym(self):
         """Test that lldb functions correctly after stepping through a crash."""
         self.buildDsym()
@@ -60,7 +60,7 @@ class CrashingRecursiveInferiorTestCase(
         self.buildDwarf()
         self.recursive_inferior_crashing_step()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def test_recursive_inferior_crashing_step_after_break_dsym(self):
         """Test that stepping after a crash behaves correctly."""
         self.buildDsym()
@@ -73,7 +73,7 @@ class CrashingRecursiveInferiorTestCase(
         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()

Modified: lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py (original)
+++ lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestInlineStepping(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -27,7 +27,7 @@ class TestInlineStepping(TestBase):
         self.buildDwarf()
         self.inline_stepping()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_step_over_with_dsym_and_python_api(self):

Modified: lldb/trunk/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py (original)
+++ lldb/trunk/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class LaunchWithShellExpandTestCase(Test
     mydir = TestBase.compute_mydir(__file__)
 
         
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym()

Modified: lldb/trunk/test/functionalities/memory/read/TestMemoryRead.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/memory/read/TestMemoryRead.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/memory/read/TestMemoryRead.py (original)
+++ lldb/trunk/test/functionalities/memory/read/TestMemoryRead.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class MemoryReadTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_memory_read_with_dsym(self):
         """Test the 'memory read' command with plain and vector formats."""

Modified: lldb/trunk/test/functionalities/nosucharch/TestNoSuchArch.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/nosucharch/TestNoSuchArch.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/nosucharch/TestNoSuchArch.py (original)
+++ lldb/trunk/test/functionalities/nosucharch/TestNoSuchArch.py Mon Mar 30 09:12:17 2015
@@ -11,14 +11,14 @@ class NoSuchArchTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
         
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym()
         self.do_test ()
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_with_dwarf (self):
         self.buildDwarf()

Modified: lldb/trunk/test/functionalities/paths/TestPaths.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/paths/TestPaths.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/paths/TestPaths.py (original)
+++ lldb/trunk/test/functionalities/paths/TestPaths.py Mon Mar 30 09:12:17 2015
@@ -34,7 +34,7 @@ class TestPaths(TestBase):
         # file path if it doesn't exist in the current directory.
         self.assertTrue (file_only.GetDirectory() == None)
 
-    @unittest2.skipUnless(sys.platform.startswith("win32"), "Test for windows only")
+    @skipUnlessPlatform(["windows"])
     def test_windows_double_slash (self):
         '''Test to check the path with double slash is handled correctly '''
         # Create a path and see if lldb gets the directory and file right

Modified: lldb/trunk/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py (original)
+++ lldb/trunk/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class PluginPythonOSPlugin(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_python_os_plugin_dsym(self):
         """Test that the Python operating system plugin works correctly"""

Modified: lldb/trunk/test/functionalities/process_attach/TestProcessAttach.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/process_attach/TestProcessAttach.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/process_attach/TestProcessAttach.py (original)
+++ lldb/trunk/test/functionalities/process_attach/TestProcessAttach.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class ProcessAttachTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_attach_to_process_by_id_with_dsym(self):
         """Test attach by process id"""
@@ -27,7 +27,7 @@ class ProcessAttachTestCase(TestBase):
         self.buildDwarf()
         self.process_attach_by_id()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_attach_to_process_by_name_with_dsym(self):
         """Test attach by process name"""

Modified: lldb/trunk/test/functionalities/process_launch/TestProcessLaunch.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/process_launch/TestProcessLaunch.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/process_launch/TestProcessLaunch.py (original)
+++ lldb/trunk/test/functionalities/process_launch/TestProcessLaunch.py Mon Mar 30 09:12:17 2015
@@ -18,7 +18,7 @@ class ProcessLaunchTestCase(TestBase):
         self.runCmd("settings set auto-confirm true")
         self.addTearDownHook(lambda: self.runCmd("settings clear auto-confirm"))
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_io_with_dsym (self):
         """Test that process launch I/O redirection flags work properly."""
@@ -117,7 +117,7 @@ class ProcessLaunchTestCase(TestBase):
 
     d = {'CXX_SOURCES' : 'print_cwd.cpp'}
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     @expectedFailureDarwin("llvm.org/pr20265")
     def test_set_working_dir_with_dsym (self):

Modified: lldb/trunk/test/functionalities/recursion/TestValueObjectRecursion.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/recursion/TestValueObjectRecursion.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/recursion/TestValueObjectRecursion.py (original)
+++ lldb/trunk/test/functionalities/recursion/TestValueObjectRecursion.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ValueObjectRecursionTestCase(TestB
 
     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."""

Modified: lldb/trunk/test/functionalities/rerun/TestRerun.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/rerun/TestRerun.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/rerun/TestRerun.py (original)
+++ lldb/trunk/test/functionalities/rerun/TestRerun.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class TestRerun(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
         
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         self.buildDsym()

Modified: lldb/trunk/test/functionalities/return-value/TestReturnValue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/return-value/TestReturnValue.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/return-value/TestReturnValue.py (original)
+++ lldb/trunk/test/functionalities/return-value/TestReturnValue.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ReturnValueTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailurei386
     @python_api_test
     @dsym_test

Modified: lldb/trunk/test/functionalities/set-data/TestSetData.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/set-data/TestSetData.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/set-data/TestSetData.py (original)
+++ lldb/trunk/test/functionalities/set-data/TestSetData.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class SetDataTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/functionalities/signal/TestSendSignal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/signal/TestSendSignal.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/signal/TestSendSignal.py (original)
+++ lldb/trunk/test/functionalities/signal/TestSendSignal.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class SendSignalTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that lldb command 'process signal SIGUSR1' sends a signal to the inferior process."""

Modified: lldb/trunk/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py (original)
+++ lldb/trunk/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class ReturnValueTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_step_out_with_dsym_python(self):
@@ -30,7 +30,7 @@ class ReturnValueTestCase(TestBase):
         self.get_to_starting_point()
         self.do_step_out_past_nodebug()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_step_over_with_dsym_python(self):
@@ -48,7 +48,7 @@ class ReturnValueTestCase(TestBase):
         self.get_to_starting_point()
         self.do_step_over_past_nodebug()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_step_in_with_dsym_python(self):

Modified: lldb/trunk/test/functionalities/stop-hook/TestStopHookCmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/stop-hook/TestStopHookCmd.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/stop-hook/TestStopHookCmd.py (original)
+++ lldb/trunk/test/functionalities/stop-hook/TestStopHookCmd.py Mon Mar 30 09:12:17 2015
@@ -18,7 +18,7 @@ class StopHookCmdTestCase(TestBase):
         """target stop-hook list should not crash if no target has been set."""
         self.runCmd("target stop-hook list", check=False)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test a sequence of target stop-hook commands."""

Modified: lldb/trunk/test/functionalities/stop-hook/TestStopHookMechanism.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/stop-hook/TestStopHookMechanism.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/stop-hook/TestStopHookMechanism.py (original)
+++ lldb/trunk/test/functionalities/stop-hook/TestStopHookMechanism.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class StopHookMechanismTestCase(TestBase
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test the stop-hook mechanism."""

Modified: lldb/trunk/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py (original)
+++ lldb/trunk/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class StopHookForMultipleThreadsTestCase
 
     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."""

Modified: lldb/trunk/test/functionalities/target_command/TestTargetCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/target_command/TestTargetCommand.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/target_command/TestTargetCommand.py (original)
+++ lldb/trunk/test/functionalities/target_command/TestTargetCommand.py Mon Mar 30 09:12:17 2015
@@ -38,7 +38,7 @@ class targetCommandTestCase(TestBase):
 
     # rdar://problem/9763907
     # 'target variable' command fails if the target program has been run
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_target_variable_command_with_dsym(self):
         """Test 'target variable' command before and after starting the inferior."""
@@ -48,7 +48,7 @@ class targetCommandTestCase(TestBase):
 
         self.do_target_variable_command('globals')
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_target_variable_command_with_dsym_no_fail(self):
         """Test 'target variable' command before and after starting the inferior."""

Modified: lldb/trunk/test/functionalities/thread/TestNumThreads.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/TestNumThreads.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/TestNumThreads.py (original)
+++ lldb/trunk/test/functionalities/thread/TestNumThreads.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class NumberOfThreadsTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test number of threads."""

Modified: lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py (original)
+++ lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class BreakpointAfterJoinTestCase(TestBa
 
     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):

Modified: lldb/trunk/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py (original)
+++ lldb/trunk/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class CreateAfterAttachTestCase(TestBase
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_create_after_attach_with_dsym(self):
         """Test thread creation after process attach."""

Modified: lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py (original)
+++ lldb/trunk/test/functionalities/thread/create_during_step/TestCreateDuringStep.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class CreateDuringStepTestCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @dsym_test
     def test_step_inst_with_dsym(self):
@@ -20,7 +20,7 @@ class CreateDuringStepTestCase(TestBase)
         self.buildDsym(dictionary=self.getBuildFlags())
         self.create_during_step_inst_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @dsym_test
     def test_step_over_with_dsym(self):
@@ -28,7 +28,7 @@ class CreateDuringStepTestCase(TestBase)
         self.buildDsym(dictionary=self.getBuildFlags())
         self.create_during_step_over_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @dsym_test
     def test_step_in_with_dsym(self):

Modified: lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py (original)
+++ lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ExitDuringBreakpointTestCase(TestB
 
     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):

Modified: lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py (original)
+++ lldb/trunk/test/functionalities/thread/exit_during_step/TestExitDuringStep.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ExitDuringStepTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @dsym_test
     def test_thread_state_is_stopped_with_dsym(self):
@@ -29,21 +29,21 @@ class ExitDuringStepTestCase(TestBase):
         self.buildDwarf(dictionary=self.getBuildFlags())
         self.thread_state_is_stopped()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test thread exit during step handling."""
         self.buildDsym(dictionary=self.getBuildFlags())
         self.exit_during_step_inst_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_step_over_with_dsym(self):
         """Test thread exit during step-over handling."""
         self.buildDsym(dictionary=self.getBuildFlags())
         self.exit_during_step_over_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_step_in_with_dsym(self):
         """Test thread exit during step-in handling."""

Modified: lldb/trunk/test/functionalities/thread/jump/TestThreadJump.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/jump/TestThreadJump.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/jump/TestThreadJump.py (original)
+++ lldb/trunk/test/functionalities/thread/jump/TestThreadJump.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ThreadJumpTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test thread jump handling."""

Modified: lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py (original)
+++ lldb/trunk/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class MultipleBreakpointTestCase(TestBas
 
     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):

Modified: lldb/trunk/test/functionalities/thread/state/TestThreadStates.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/state/TestThreadStates.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/state/TestThreadStates.py (original)
+++ lldb/trunk/test/functionalities/thread/state/TestThreadStates.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ThreadStateTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     @expectedFailureDarwin("rdar://15367566")
     def test_state_after_breakpoint_with_dsym(self):
@@ -29,7 +29,7 @@ class ThreadStateTestCase(TestBase):
         self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False))
         self.thread_state_after_breakpoint_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_state_after_continue_with_dsym(self):
         """Test thread state after continue."""
@@ -42,7 +42,7 @@ class ThreadStateTestCase(TestBase):
         self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False))
         self.thread_state_after_continue_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_state_after_expression_with_dsym(self):
         """Test thread state after expression."""
@@ -55,7 +55,7 @@ class ThreadStateTestCase(TestBase):
         self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False))
         self.thread_state_after_continue_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     @unittest2.expectedFailure("llvm.org/pr16172") # thread states not properly maintained
     def test_process_interrupt_with_dsym(self):
@@ -70,7 +70,7 @@ class ThreadStateTestCase(TestBase):
         self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False))
         self.process_interrupt_test()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     @unittest2.expectedFailure("llvm.org/pr15824") # thread states not properly maintained
     def test_process_state_with_dsym(self):

Modified: lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py (original)
+++ lldb/trunk/test/functionalities/thread/thread_exit/TestThreadExit.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ThreadExitTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py (original)
+++ lldb/trunk/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ThreadSpecificBreakTestCase(TestBa
 
     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):

Modified: lldb/trunk/test/functionalities/tty/TestTerminal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/tty/TestTerminal.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/tty/TestTerminal.py (original)
+++ lldb/trunk/test/functionalities/tty/TestTerminal.py Mon Mar 30 09:12:17 2015
@@ -15,7 +15,7 @@ class LaunchInTerminalTestCase(TestBase)
     # Darwin is the only platform that I know of that supports optionally launching
     # a program in a separate terminal window. It would be great if other platforms
     # added support for this.
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
 
 
     # If the test is being run under sudo, the spawned terminal won't retain that elevated

Modified: lldb/trunk/test/functionalities/type_completion/TestTypeCompletion.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/type_completion/TestTypeCompletion.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/type_completion/TestTypeCompletion.py (original)
+++ lldb/trunk/test/functionalities/type_completion/TestTypeCompletion.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class TypeCompletionTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Check that types only get completed when necessary."""

Modified: lldb/trunk/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py (original)
+++ lldb/trunk/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ import lldbutil
 class NoreturnUnwind(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         """Test that we can backtrace correctly with 'noreturn' functions on the stack"""

Modified: lldb/trunk/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py (original)
+++ lldb/trunk/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class SigtrampUnwind(TestBase):
 
     # On different platforms the "_sigtramp" and "__kill" frames are likely to be different.
     # This test could probably be adapted to run on linux/*bsd easily enough.
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym (self):
         """Test that we can backtrace correctly with _sigtramp on the stack"""
@@ -21,7 +21,7 @@ class SigtrampUnwind(TestBase):
         self.setTearDownCleanup()
         self.sigtramp_unwind_tests()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dwarf_test
     def test_with_dwarf (self):
         """Test that we can backtrace correctly with _sigtramp on the stack"""

Modified: lldb/trunk/test/functionalities/value_md5_crash/TestValueMD5Crash.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/value_md5_crash/TestValueMD5Crash.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/value_md5_crash/TestValueMD5Crash.py (original)
+++ lldb/trunk/test/functionalities/value_md5_crash/TestValueMD5Crash.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ValueMD5CrashTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Verify that the hash computing logic for ValueObject's values can't crash us."""

Modified: lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class HelloWatchLocationTestCase(TestBas
 
     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."""

Modified: lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class WatchpointForMultipleThreadsTestCa
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_watchpoint_multiple_threads_with_dsym(self):
         """Test that lldb watchpoint works for multiple threads."""
@@ -30,7 +30,7 @@ class WatchpointForMultipleThreadsTestCa
         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."""

Modified: lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class TestStepOverWatchpoint(TestBase):
     def getCategories(self):
         return ['basic_process']
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym(self):
         """Test stepping over watchpoints."""

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py Mon Mar 30 09:12:17 2015
@@ -26,7 +26,7 @@ class WatchpointCommandsTestCase(TestBas
         self.exe_name = self.testMethodName
         self.d = {'C_SOURCES': self.source, 'EXE': self.exe_name}
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_rw_watchpoint_with_dsym(self):
         """Test read_write watchpoint and expect to stop two times."""
@@ -41,7 +41,7 @@ class WatchpointCommandsTestCase(TestBas
         self.setTearDownCleanup(dictionary=self.d)
         self.normal_read_write_watchpoint()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_rw_watchpoint_delete_with_dsym(self):
         """Test delete watchpoint and expect not to stop for watchpoint."""
@@ -56,7 +56,7 @@ class WatchpointCommandsTestCase(TestBas
         self.setTearDownCleanup(dictionary=self.d)
         self.delete_read_write_watchpoint()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_rw_watchpoint_set_ignore_count_with_dsym(self):
         """Test watchpoint ignore count and expect to not to stop at all."""
@@ -71,7 +71,7 @@ class WatchpointCommandsTestCase(TestBas
         self.setTearDownCleanup(dictionary=self.d)
         self.ignore_read_write_watchpoint()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_rw_disable_after_first_stop_with_dsym(self):
         """Test read_write watchpoint but disable it after the first stop."""
@@ -86,7 +86,7 @@ class WatchpointCommandsTestCase(TestBas
         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."""

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py Mon Mar 30 09:12:17 2015
@@ -25,7 +25,7 @@ class WatchpointLLDBCommandTestCase(Test
         self.exe_name = 'a%d.out' % self.test_number
         self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name}
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_watchpoint_command_with_dsym(self):
         """Test 'watchpoint command'."""
@@ -40,7 +40,7 @@ class WatchpointLLDBCommandTestCase(Test
         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."""

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py Mon Mar 30 09:12:17 2015
@@ -25,7 +25,7 @@ class WatchpointPythonCommandTestCase(Te
         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'."""

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py Mon Mar 30 09:12:17 2015
@@ -25,7 +25,7 @@ class WatchpointConditionCmdTestCase(Tes
         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."""

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestWatchpointEvents (TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class WatchLocationUsingWatchpointSetTes
 
     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."""

Modified: lldb/trunk/test/lang/c/array_types/TestArrayTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/array_types/TestArrayTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/array_types/TestArrayTypes.py (original)
+++ lldb/trunk/test/lang/c/array_types/TestArrayTypes.py Mon Mar 30 09:12:17 2015
@@ -10,14 +10,14 @@ class ArrayTypesTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test '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):

Modified: lldb/trunk/test/lang/c/bitfields/TestBitfields.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/bitfields/TestBitfields.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/bitfields/TestBitfields.py (original)
+++ lldb/trunk/test/lang/c/bitfields/TestBitfields.py Mon Mar 30 09:12:17 2015
@@ -10,14 +10,14 @@ class BitfieldsTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test '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 @@ class BitfieldsTestCase(TestBase):
         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 @@ class BitfieldsTestCase(TestBase):
 
     @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."""

Modified: lldb/trunk/test/lang/c/enum_types/TestEnumTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/enum_types/TestEnumTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/enum_types/TestEnumTypes.py (original)
+++ lldb/trunk/test/lang/c/enum_types/TestEnumTypes.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class EnumTypesTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/c/forward/TestForwardDeclaration.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/forward/TestForwardDeclaration.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/forward/TestForwardDeclaration.py (original)
+++ lldb/trunk/test/lang/c/forward/TestForwardDeclaration.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class ForwardDeclarationTestCase(TestBas
 
     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."""

Modified: lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py (original)
+++ lldb/trunk/test/lang/c/function_types/TestFunctionTypes.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class FunctionTypesTestCase(TestBase):
 
     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 @@ class FunctionTypesTestCase(TestBase):
         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."""

Modified: lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py (original)
+++ lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class GlobalVariablesTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/c/set_values/TestSetValues.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/set_values/TestSetValues.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/set_values/TestSetValues.py (original)
+++ lldb/trunk/test/lang/c/set_values/TestSetValues.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class SetValuesTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/c/stepping/TestStepAndBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/stepping/TestStepAndBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/stepping/TestStepAndBreakpoints.py (original)
+++ lldb/trunk/test/lang/c/stepping/TestStepAndBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class TestCStepping(TestBase):
     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):

Modified: lldb/trunk/test/lang/c/stepping/TestThreadStepping.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/stepping/TestThreadStepping.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/stepping/TestThreadStepping.py (original)
+++ lldb/trunk/test/lang/c/stepping/TestThreadStepping.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class ThreadSteppingTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/c/strings/TestCStrings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/strings/TestCStrings.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/strings/TestCStrings.py (original)
+++ lldb/trunk/test/lang/c/strings/TestCStrings.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CStringsTestCase(TestBase):
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Tests that C strings work as expected in expressions"""

Modified: lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py (original)
+++ lldb/trunk/test/lang/c/tls_globals/TestTlsGlobals.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TlsGlobalTestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/lang/cpp/bool/TestCPPBool.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/bool/TestCPPBool.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/bool/TestCPPBool.py (original)
+++ lldb/trunk/test/lang/cpp/bool/TestCPPBool.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CPPBoolTestCase(TestBase):
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that bool types work in the expression parser"""

Modified: lldb/trunk/test/lang/cpp/breakpoints/TestCPPBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/breakpoints/TestCPPBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/breakpoints/TestCPPBreakpoints.py (original)
+++ lldb/trunk/test/lang/cpp/breakpoints/TestCPPBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class CPPBreakpointTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/cpp/call-function/TestCallCPPFunction.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/call-function/TestCallCPPFunction.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/call-function/TestCallCPPFunction.py (original)
+++ lldb/trunk/test/lang/cpp/call-function/TestCallCPPFunction.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class CallCPPFunctionTestCase(TestBase):
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test calling a function by basename"""

Modified: lldb/trunk/test/lang/cpp/char1632_t/TestChar1632T.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/char1632_t/TestChar1632T.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/char1632_t/TestChar1632T.py (original)
+++ lldb/trunk/test/lang/cpp/char1632_t/TestChar1632T.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Char1632TestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py (original)
+++ lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class StaticVariableTestCase(TestBase):
     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 @@ class StaticVariableTestCase(TestBase):
         self.buildDwarf()
         self.static_variable_commands()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailureClang(9980907)
     @expectedFailureGcc(9980907)
     @python_api_test

Modified: lldb/trunk/test/lang/cpp/class_types/TestClassTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/class_types/TestClassTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/class_types/TestClassTypes.py (original)
+++ lldb/trunk/test/lang/cpp/class_types/TestClassTypes.py Mon Mar 30 09:12:17 2015
@@ -12,14 +12,14 @@ class ClassTypesTestCase(TestBase):
     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 @@ class ClassTypesTestCase(TestBase):
         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 @@ class ClassTypesTestCase(TestBase):
         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

Modified: lldb/trunk/test/lang/cpp/class_types/TestClassTypesDisassembly.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/class_types/TestClassTypesDisassembly.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/class_types/TestClassTypesDisassembly.py (original)
+++ lldb/trunk/test/lang/cpp/class_types/TestClassTypesDisassembly.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class IterateFrameAndDisassembleTestCase
     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 @@ class IterateFrameAndDisassembleTestCase
         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):

Modified: lldb/trunk/test/lang/cpp/diamond/TestDiamond.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/diamond/TestDiamond.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/diamond/TestDiamond.py (original)
+++ lldb/trunk/test/lang/cpp/diamond/TestDiamond.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CPPTestDiamondInheritance(TestBase
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that virtual base classes work in when SBValue objects are used to explore the variable value"""

Modified: lldb/trunk/test/lang/cpp/dynamic-value/TestCppValueCast.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/dynamic-value/TestCppValueCast.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/dynamic-value/TestCppValueCast.py (original)
+++ lldb/trunk/test/lang/cpp/dynamic-value/TestCppValueCast.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class CppValueCastTestCase(TestBase):
     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 @@ class CppValueCastTestCase(TestBase):
         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):

Modified: lldb/trunk/test/lang/cpp/dynamic-value/TestDynamicValue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/dynamic-value/TestDynamicValue.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/dynamic-value/TestDynamicValue.py (original)
+++ lldb/trunk/test/lang/cpp/dynamic-value/TestDynamicValue.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DynamicValueTestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/enum_types/TestCPP11EnumTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/enum_types/TestCPP11EnumTypes.py (original)
+++ lldb/trunk/test/lang/cpp/enum_types/TestCPP11EnumTypes.py Mon Mar 30 09:12:17 2015
@@ -10,56 +10,56 @@ class CPP11EnumTypesTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py (original)
+++ lldb/trunk/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class CPPBreakpointTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/cpp/namespace/TestNamespace.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/namespace/TestNamespace.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/namespace/TestNamespace.py (original)
+++ lldb/trunk/test/lang/cpp/namespace/TestNamespace.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class NamespaceTestCase(TestBase):
     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."""

Modified: lldb/trunk/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py (original)
+++ lldb/trunk/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class CPPStaticMethodsTestCase(TestBase)
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that functions with the same name are resolved correctly"""

Modified: lldb/trunk/test/lang/cpp/rdar12991846/TestRdar12991846.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/rdar12991846/TestRdar12991846.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/rdar12991846/TestRdar12991846.py (original)
+++ lldb/trunk/test/lang/cpp/rdar12991846/TestRdar12991846.py Mon Mar 30 09:12:17 2015
@@ -27,7 +27,7 @@ class Rdar12991846TestCase(TestBase):
     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 @@ class Rdar12991846TestCase(TestBase):
         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 @@ class Rdar12991846TestCase(TestBase):
         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."""

Modified: lldb/trunk/test/lang/cpp/rvalue-references/TestRvalueReferences.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/rvalue-references/TestRvalueReferences.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/rvalue-references/TestRvalueReferences.py (original)
+++ lldb/trunk/test/lang/cpp/rvalue-references/TestRvalueReferences.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class RvalueReferencesTestCase(TestBase)
     
     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):

Modified: lldb/trunk/test/lang/cpp/signed_types/TestSignedTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/signed_types/TestSignedTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/signed_types/TestSignedTypes.py (original)
+++ lldb/trunk/test/lang/cpp/signed_types/TestSignedTypes.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class UnsignedTypesTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/cpp/static_members/TestCPPStaticMembers.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/static_members/TestCPPStaticMembers.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/static_members/TestCPPStaticMembers.py (original)
+++ lldb/trunk/test/lang/cpp/static_members/TestCPPStaticMembers.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CPPStaticMembersTestCase(TestBase)
     
     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):

Modified: lldb/trunk/test/lang/cpp/static_methods/TestCPPStaticMethods.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/static_methods/TestCPPStaticMethods.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/static_methods/TestCPPStaticMethods.py (original)
+++ lldb/trunk/test/lang/cpp/static_methods/TestCPPStaticMethods.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class CPPStaticMethodsTestCase(TestBase)
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that static methods are properly distinguished from regular methods"""

Modified: lldb/trunk/test/lang/cpp/stl/TestSTL.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/stl/TestSTL.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/stl/TestSTL.py (original)
+++ lldb/trunk/test/lang/cpp/stl/TestSTL.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class STLTestCase(TestBase):
 
     # 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."""

Modified: lldb/trunk/test/lang/cpp/this/TestCPPThis.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/this/TestCPPThis.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/this/TestCPPThis.py (original)
+++ lldb/trunk/test/lang/cpp/this/TestCPPThis.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CPPThisTestCase(TestBase):
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     #rdar://problem/9962849
     #@expectedFailureClang
     @dsym_test

Modified: lldb/trunk/test/lang/cpp/unique-types/TestUniqueTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/unique-types/TestUniqueTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/unique-types/TestUniqueTypes.py (original)
+++ lldb/trunk/test/lang/cpp/unique-types/TestUniqueTypes.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class UniqueTypesTestCase(TestBase):
 
     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<long> and std::vector<short>."""

Modified: lldb/trunk/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/unsigned_types/TestUnsignedTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/unsigned_types/TestUnsignedTypes.py (original)
+++ lldb/trunk/test/lang/cpp/unsigned_types/TestUnsignedTypes.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class UnsignedTypesTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/cpp/virtual/TestVirtual.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/virtual/TestVirtual.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/virtual/TestVirtual.py (original)
+++ lldb/trunk/test/lang/cpp/virtual/TestVirtual.py Mon Mar 30 09:12:17 2015
@@ -22,8 +22,8 @@ class CppVirtualMadness(TestBase):
     # 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()

Modified: lldb/trunk/test/lang/cpp/wchar_t/TestCxxWCharT.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/wchar_t/TestCxxWCharT.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/wchar_t/TestCxxWCharT.py (original)
+++ lldb/trunk/test/lang/cpp/wchar_t/TestCxxWCharT.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class CxxWCharTTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py (original)
+++ lldb/trunk/test/lang/objc/blocks/TestObjCIvarsInBlocks.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCIvarsInBlocks(TestBase):
 
     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 @@ class TestObjCIvarsInBlocks(TestBase):
         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

Modified: lldb/trunk/test/lang/objc/forward-decl/TestForwardDecl.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/forward-decl/TestForwardDecl.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/forward-decl/TestForwardDecl.py (original)
+++ lldb/trunk/test/lang/objc/forward-decl/TestForwardDecl.py Mon Mar 30 09:12:17 2015
@@ -10,13 +10,13 @@ class ForwardDeclTestCase(TestBase):
 
     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()

Modified: lldb/trunk/test/lang/objc/foundation/TestConstStrings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestConstStrings.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestConstStrings.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestConstStrings.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class ConstStringTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/foundation/TestFoundationDisassembly.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestFoundationDisassembly.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestFoundationDisassembly.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestFoundationDisassembly.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class FoundationDisassembleTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/foundation/TestObjCMethods.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestObjCMethods.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestObjCMethods.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestObjCMethods.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ from lldbtest import *
 import lldbutil
 
 file_index = 0
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class FoundationTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/foundation/TestObjCMethods2.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestObjCMethods2.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestObjCMethods2.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestObjCMethods2.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class FoundationTestCase2(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/foundation/TestObjectDescriptionAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestObjectDescriptionAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestObjectDescriptionAPI.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestObjectDescriptionAPI.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class ObjectDescriptionAPITestCase(TestB
     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 @@ class ObjectDescriptionAPITestCase(TestB
         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):

Modified: lldb/trunk/test/lang/objc/foundation/TestRuntimeTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestRuntimeTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestRuntimeTypes.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestRuntimeTypes.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class RuntimeTypesTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/foundation/TestSymbolTable.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/foundation/TestSymbolTable.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/foundation/TestSymbolTable.py (original)
+++ lldb/trunk/test/lang/objc/foundation/TestSymbolTable.py Mon Mar 30 09:12:17 2015
@@ -7,7 +7,7 @@ import unittest2
 import lldb
 from lldbtest import *
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class FoundationSymtabTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/hidden-ivars/TestHiddenIvars.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/hidden-ivars/TestHiddenIvars.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/hidden-ivars/TestHiddenIvars.py (original)
+++ lldb/trunk/test/lang/objc/hidden-ivars/TestHiddenIvars.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class HiddenIvarsTestCase(TestBase):
 
     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 @@ class HiddenIvarsTestCase(TestBase):
             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 @@ class HiddenIvarsTestCase(TestBase):
             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 @@ class HiddenIvarsTestCase(TestBase):
             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 @@ class HiddenIvarsTestCase(TestBase):
             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 @@ class HiddenIvarsTestCase(TestBase):
             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 @@ class HiddenIvarsTestCase(TestBase):
             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 @@ class HiddenIvarsTestCase(TestBase):
             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':

Modified: lldb/trunk/test/lang/objc/objc++/TestObjCXX.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc%2B%2B/TestObjCXX.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc++/TestObjCXX.py (original)
+++ lldb/trunk/test/lang/objc/objc++/TestObjCXX.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class ObjCXXTestCase(TestBase):
         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"""

Modified: lldb/trunk/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py (original)
+++ lldb/trunk/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ObjCDynamicValueTestCase(TestBase)
 
     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 @@ class ObjCDynamicValueTestCase(TestBase)
         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):

Modified: lldb/trunk/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py (original)
+++ lldb/trunk/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCBuiltinTypes(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
 
     @dsym_test

Modified: lldb/trunk/test/lang/objc/objc-checker/TestObjCCheckers.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-checker/TestObjCCheckers.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-checker/TestObjCCheckers.py (original)
+++ lldb/trunk/test/lang/objc/objc-checker/TestObjCCheckers.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ObjCCheckerTestCase(TestBase):
 
     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 @@ class ObjCCheckerTestCase(TestBase):
         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):

Modified: lldb/trunk/test/lang/objc/objc-class-method/TestObjCClassMethod.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-class-method/TestObjCClassMethod.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-class-method/TestObjCClassMethod.py (original)
+++ lldb/trunk/test/lang/objc/objc-class-method/TestObjCClassMethod.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCClassMethod(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
 
     @expectedFailurei386
@@ -20,7 +20,7 @@ class TestObjCClassMethod(TestBase):
         self.buildDsym()
         self.objc_class_method()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailurei386
     @python_api_test
     @dwarf_test

Modified: lldb/trunk/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py (original)
+++ lldb/trunk/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class ObjCDynamicSBTypeTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py (original)
+++ lldb/trunk/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ObjCDynamicValueTestCase(TestBase)
 
     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 @@ class ObjCDynamicValueTestCase(TestBase)
         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")

Modified: lldb/trunk/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py (original)
+++ lldb/trunk/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCIvarOffsets(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -18,7 +18,7 @@ class TestObjCIvarOffsets(TestBase):
         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):

Modified: lldb/trunk/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py (original)
+++ lldb/trunk/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCIvarStripped(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):

Modified: lldb/trunk/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py (original)
+++ lldb/trunk/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py Mon Mar 30 09:12:17 2015
@@ -14,7 +14,7 @@ class ObjCNewSyntaxTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_expr_with_dsym(self):
         self.buildDsym()

Modified: lldb/trunk/test/lang/objc/objc-optimized/TestObjcOptimized.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-optimized/TestObjcOptimized.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-optimized/TestObjcOptimized.py (original)
+++ lldb/trunk/test/lang/objc/objc-optimized/TestObjcOptimized.py Mon Mar 30 09:12:17 2015
@@ -16,7 +16,7 @@ import re
 
 # rdar://problem/9087739
 # test failure: objc_optimized does not work for "-C clang -A i386"
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class ObjcOptimizedTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/objc-property/TestObjCProperty.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-property/TestObjCProperty.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-property/TestObjCProperty.py (original)
+++ lldb/trunk/test/lang/objc/objc-property/TestObjCProperty.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ObjCPropertyTestCase(TestBase):
 
     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 @@ class ObjCPropertyTestCase(TestBase):
         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):

Modified: lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py (original)
+++ lldb/trunk/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCStaticMethodStripped(TestB
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     #<rdar://problem/12042992>
     @dsym_test

Modified: lldb/trunk/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-static-method/TestObjCStaticMethod.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-static-method/TestObjCStaticMethod.py (original)
+++ lldb/trunk/test/lang/objc/objc-static-method/TestObjCStaticMethod.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCStaticMethod(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     #<rdar://problem/9745789> "expression" can't call functions in class methods
     @dsym_test
@@ -19,7 +19,7 @@ class TestObjCStaticMethod(TestBase):
         self.buildDsym()
         self.objc_static_method()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     #<rdar://problem/9745789> "expression" can't call functions in class methods
     @dwarf_test

Modified: lldb/trunk/test/lang/objc/objc-stepping/TestObjCStepping.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-stepping/TestObjCStepping.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-stepping/TestObjCStepping.py (original)
+++ lldb/trunk/test/lang/objc/objc-stepping/TestObjCStepping.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class TestObjCStepping(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -21,7 +21,7 @@ class TestObjCStepping(TestBase):
         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):

Modified: lldb/trunk/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-struct-return/TestObjCStructReturn.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-struct-return/TestObjCStructReturn.py (original)
+++ lldb/trunk/test/lang/objc/objc-struct-return/TestObjCStructReturn.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCClassMethod(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -18,7 +18,7 @@ class TestObjCClassMethod(TestBase):
         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):

Modified: lldb/trunk/test/lang/objc/objc-super/TestObjCSuper.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc-super/TestObjCSuper.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc-super/TestObjCSuper.py (original)
+++ lldb/trunk/test/lang/objc/objc-super/TestObjCSuper.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestObjCSuperMethod(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailurei386
     @python_api_test
     @dsym_test
@@ -19,7 +19,7 @@ class TestObjCSuperMethod(TestBase):
         self.buildDsym()
         self.objc_super()
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @expectedFailurei386
     @python_api_test
     @dwarf_test

Modified: lldb/trunk/test/lang/objc/print-obj/TestPrintObj.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/print-obj/TestPrintObj.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/print-obj/TestPrintObj.py (original)
+++ lldb/trunk/test/lang/objc/print-obj/TestPrintObj.py Mon Mar 30 09:12:17 2015
@@ -7,7 +7,7 @@ import unittest2
 import lldb
 from lldbtest import *
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class PrintObjTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py (original)
+++ lldb/trunk/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class MethodReturningBOOLTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/rdar-10967107/TestRdar10967107.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/rdar-10967107/TestRdar10967107.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/rdar-10967107/TestRdar10967107.py (original)
+++ lldb/trunk/test/lang/objc/rdar-10967107/TestRdar10967107.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class Rdar10967107TestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/rdar-11355592/TestRdar11355592.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/rdar-11355592/TestRdar11355592.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/rdar-11355592/TestRdar11355592.py (original)
+++ lldb/trunk/test/lang/objc/rdar-11355592/TestRdar11355592.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class Rdar10967107TestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/rdar-12408181/TestRdar12408181.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/rdar-12408181/TestRdar12408181.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/rdar-12408181/TestRdar12408181.py (original)
+++ lldb/trunk/test/lang/objc/rdar-12408181/TestRdar12408181.py Mon Mar 30 09:12:17 2015
@@ -8,7 +8,7 @@ import lldb
 from lldbtest import *
 import lldbutil
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class Rdar12408181TestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/lang/objc/real-definition/TestRealDefinition.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/real-definition/TestRealDefinition.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/real-definition/TestRealDefinition.py (original)
+++ lldb/trunk/test/lang/objc/real-definition/TestRealDefinition.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestRealDefinition(TestBase):
 
     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 @@ class TestRealDefinition(TestBase):
         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 @@ class TestRealDefinition(TestBase):
         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 @@ class TestRealDefinition(TestBase):
         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"""

Modified: lldb/trunk/test/lang/objc/self/TestObjCSelf.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/self/TestObjCSelf.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/self/TestObjCSelf.py (original)
+++ lldb/trunk/test/lang/objc/self/TestObjCSelf.py Mon Mar 30 09:12:17 2015
@@ -9,14 +9,14 @@ class ObjCSelfTestCase(TestBase):
     
     mydir = TestBase.compute_mydir(__file__)
     
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that the 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"""

Modified: lldb/trunk/test/linux/builtin_trap/TestBuiltinTrap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/linux/builtin_trap/TestBuiltinTrap.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/linux/builtin_trap/TestBuiltinTrap.py (original)
+++ lldb/trunk/test/linux/builtin_trap/TestBuiltinTrap.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class BuiltinTrapTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @dsym_test
     def test_with_dsym_and_run_command(self):
         """Test that LLDB handles a function with __builtin_trap correctly."""

Modified: lldb/trunk/test/lldbinline.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbinline.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lldbinline.py (original)
+++ lldb/trunk/test/lldbinline.py Mon Mar 30 09:12:17 2015
@@ -114,7 +114,7 @@ class InlineTest(TestBase):
         makefile.close()
 
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     def __test_with_dsym(self):
         self.using_dsym = True
         self.BuildMakefile()

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Mon Mar 30 09:12:17 2015
@@ -587,7 +587,7 @@ def expectedFailurex86_64(bugnumber=None
 
 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))
     return expectedFailure(fn, bugnumber)
 
@@ -641,36 +641,6 @@ def skipIfRemoteDueToDeadlock(func):
             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):
@@ -690,36 +660,53 @@ def skipIfNoSBHeaders(func):
             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 
@@ -1400,6 +1387,10 @@ class Base(unittest2.TestCase):
                 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"]])

Modified: lldb/trunk/test/logging/TestLogging.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/logging/TestLogging.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/logging/TestLogging.py (original)
+++ lldb/trunk/test/logging/TestLogging.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class LogTestCase(TestBase):
         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 ()

Modified: lldb/trunk/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py (original)
+++ lldb/trunk/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py Mon Mar 30 09:12:17 2015
@@ -6,7 +6,7 @@ import lldb
 import sys
 from lldbtest import *
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class AddDsymMidExecutionCommandCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)

Modified: lldb/trunk/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py (original)
+++ lldb/trunk/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class AppleTypesTestCase(TestBase):
     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 @@ class AppleTypesTestCase(TestBase):
         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."""

Modified: lldb/trunk/test/macosx/indirect_symbol/TestIndirectSymbols.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/indirect_symbol/TestIndirectSymbols.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/indirect_symbol/TestIndirectSymbols.py (original)
+++ lldb/trunk/test/macosx/indirect_symbol/TestIndirectSymbols.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestIndirectFunctions(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -18,7 +18,7 @@ class TestIndirectFunctions(TestBase):
         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):

Modified: lldb/trunk/test/macosx/order/TestOrderFile.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/order/TestOrderFile.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/order/TestOrderFile.py (original)
+++ lldb/trunk/test/macosx/order/TestOrderFile.py Mon Mar 30 09:12:17 2015
@@ -12,14 +12,14 @@ class OrderFileTestCase(TestBase):
 
     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."""

Modified: lldb/trunk/test/macosx/queues/TestQueues.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/queues/TestQueues.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/queues/TestQueues.py (original)
+++ lldb/trunk/test/macosx/queues/TestQueues.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestQueues(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -19,7 +19,7 @@ class TestQueues(TestBase):
         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):

Modified: lldb/trunk/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/safe-to-func-call/TestSafeFuncCalls.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/safe-to-func-call/TestSafeFuncCalls.py (original)
+++ lldb/trunk/test/macosx/safe-to-func-call/TestSafeFuncCalls.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class TestSafeFuncCalls(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_python_api(self):
@@ -18,7 +18,7 @@ class TestSafeFuncCalls(TestBase):
         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):

Modified: lldb/trunk/test/macosx/universal/TestUniversal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/macosx/universal/TestUniversal.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/macosx/universal/TestUniversal.py (original)
+++ lldb/trunk/test/macosx/universal/TestUniversal.py Mon Mar 30 09:12:17 2015
@@ -17,8 +17,8 @@ class UniversalTestCase(TestBase):
         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 @@ class UniversalTestCase(TestBase):
         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

Modified: lldb/trunk/test/python_api/breakpoint/TestBreakpointAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/breakpoint/TestBreakpointAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/breakpoint/TestBreakpointAPI.py (original)
+++ lldb/trunk/test/python_api/breakpoint/TestBreakpointAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class BreakpointAPITestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/python_api/class_members/TestSBTypeClassMembers.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/class_members/TestSBTypeClassMembers.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/class_members/TestSBTypeClassMembers.py (original)
+++ lldb/trunk/test/python_api/class_members/TestSBTypeClassMembers.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class SBTypeMemberFunctionsTest(TestBase
 
     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 @@ class SBTypeMemberFunctionsTest(TestBase
         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):

Modified: lldb/trunk/test/python_api/event/TestEvents.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/event/TestEvents.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/event/TestEvents.py (original)
+++ lldb/trunk/test/python_api/event/TestEvents.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class EventAPITestCase(TestBase):
 
     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 @@ class EventAPITestCase(TestBase):
         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 @@ class EventAPITestCase(TestBase):
         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 @@ class EventAPITestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/findvalue_duplist/TestSBFrameFindValue.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/findvalue_duplist/TestSBFrameFindValue.py (original)
+++ lldb/trunk/test/python_api/findvalue_duplist/TestSBFrameFindValue.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class SBFrameFindValueTestCase(TestBase)
 
     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):

Modified: lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py (original)
+++ lldb/trunk/test/python_api/formatters/TestFormattersSBAPI.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class SBFormattersAPITestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/python_api/frame/TestFrames.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/frame/TestFrames.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/frame/TestFrames.py (original)
+++ lldb/trunk/test/python_api/frame/TestFrames.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class FrameAPITestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/python_api/frame/inlines/TestInlinedFrame.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/frame/inlines/TestInlinedFrame.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/frame/inlines/TestInlinedFrame.py (original)
+++ lldb/trunk/test/python_api/frame/inlines/TestInlinedFrame.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class InlinedFrameAPITestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py (original)
+++ lldb/trunk/test/python_api/function_symbol/TestDisasmAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class DisasmAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py (original)
+++ lldb/trunk/test/python_api/function_symbol/TestSymbolAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class SymbolAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/hello_world/TestHelloWorld.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/hello_world/TestHelloWorld.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/hello_world/TestHelloWorld.py (original)
+++ lldb/trunk/test/python_api/hello_world/TestHelloWorld.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class HelloWorldTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_process_launch_api(self):
@@ -34,7 +34,7 @@ class HelloWorldTestCase(TestBase):
         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 @@ class HelloWorldTestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/interpreter/TestCommandInterpreterAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/interpreter/TestCommandInterpreterAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/interpreter/TestCommandInterpreterAPI.py (original)
+++ lldb/trunk/test/python_api/interpreter/TestCommandInterpreterAPI.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class CommandInterpreterAPICase(TestBase
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_process_launch_api(self):

Modified: lldb/trunk/test/python_api/objc_type/TestObjCType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/objc_type/TestObjCType.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/objc_type/TestObjCType.py (original)
+++ lldb/trunk/test/python_api/objc_type/TestObjCType.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ObjCSBTypeTestCase(TestBase):
 
     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 @@ class ObjCSBTypeTestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/process/TestProcessAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/process/TestProcessAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/process/TestProcessAPI.py (original)
+++ lldb/trunk/test/python_api/process/TestProcessAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ProcessAPITestCase(TestBase):
 
     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 @@ class ProcessAPITestCase(TestBase):
         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 @@ class ProcessAPITestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/process/io/TestProcessIO.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/process/io/TestProcessIO.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/process/io/TestProcessIO.py (original)
+++ lldb/trunk/test/python_api/process/io/TestProcessIO.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class ProcessIOTestCase(TestBase):
 
     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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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 @@ class ProcessIOTestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py (original)
+++ lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class Radar12481949DataFormatterTestCase
     # 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."""

Modified: lldb/trunk/test/python_api/sbdata/TestSBData.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/sbdata/TestSBData.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/sbdata/TestSBData.py (original)
+++ lldb/trunk/test/python_api/sbdata/TestSBData.py Mon Mar 30 09:12:17 2015
@@ -11,7 +11,7 @@ class SBDataAPICase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_run_command(self):

Modified: lldb/trunk/test/python_api/sbvalue_persist/TestSBValuePersist.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/sbvalue_persist/TestSBValuePersist.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/sbvalue_persist/TestSBValuePersist.py (original)
+++ lldb/trunk/test/python_api/sbvalue_persist/TestSBValuePersist.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class SBValuePersistTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/section/TestSectionAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/section/TestSectionAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/section/TestSectionAPI.py (original)
+++ lldb/trunk/test/python_api/section/TestSectionAPI.py Mon Mar 30 09:12:17 2015
@@ -9,7 +9,7 @@ class SectionAPITestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py (original)
+++ lldb/trunk/test/python_api/symbol-context/TestSymbolContext.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class SymbolContextAPITestCase(TestBase)
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/target/TestTargetAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/target/TestTargetAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/target/TestTargetAPI.py (original)
+++ lldb/trunk/test/python_api/target/TestTargetAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class TargetAPITestCase(TestBase):
 
     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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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 @@ class TargetAPITestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/thread/TestThreadAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/thread/TestThreadAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/thread/TestThreadAPI.py (original)
+++ lldb/trunk/test/python_api/thread/TestThreadAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ThreadAPITestCase(TestBase):
 
     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 @@ class ThreadAPITestCase(TestBase):
         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 @@ class ThreadAPITestCase(TestBase):
         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 @@ class ThreadAPITestCase(TestBase):
         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 @@ class ThreadAPITestCase(TestBase):
         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):

Modified: lldb/trunk/test/python_api/type/TestTypeList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/type/TestTypeList.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/type/TestTypeList.py (original)
+++ lldb/trunk/test/python_api/type/TestTypeList.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class TypeAndTypeListTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/value/TestValueAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value/TestValueAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/value/TestValueAPI.py (original)
+++ lldb/trunk/test/python_api/value/TestValueAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ValueAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/value/change_values/TestChangeValueAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value/change_values/TestChangeValueAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/value/change_values/TestChangeValueAPI.py (original)
+++ lldb/trunk/test/python_api/value/change_values/TestChangeValueAPI.py Mon Mar 30 09:12:17 2015
@@ -12,7 +12,7 @@ class ChangeValueAPITestCase(TestBase):
 
     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):

Modified: lldb/trunk/test/python_api/value/linked_list/TestValueAPILinkedList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value/linked_list/TestValueAPILinkedList.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/value/linked_list/TestValueAPILinkedList.py (original)
+++ lldb/trunk/test/python_api/value/linked_list/TestValueAPILinkedList.py Mon Mar 30 09:12:17 2015
@@ -13,7 +13,7 @@ class ValueAsLinkedListTestCase(TestBase
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym(self):

Modified: lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py (original)
+++ lldb/trunk/test/python_api/value_var_update/TestValueVarUpdate.py Mon Mar 30 09:12:17 2015
@@ -10,7 +10,7 @@ class HelloWorldTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    @skipUnlessDarwin
     @python_api_test
     @dsym_test
     def test_with_dsym_and_process_launch_api(self):

Modified: lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py (original)
+++ lldb/trunk/test/python_api/watchpoint/TestSetWatchpoint.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class SetWatchpointAPITestCase(TestBase)
         # 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):

Modified: lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py (original)
+++ lldb/trunk/test/python_api/watchpoint/TestWatchpointIgnoreCount.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class WatchpointIgnoreCountTestCase(Test
         # 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):

Modified: lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py (original)
+++ lldb/trunk/test/python_api/watchpoint/TestWatchpointIter.py Mon Mar 30 09:12:17 2015
@@ -20,7 +20,7 @@ class WatchpointIteratorTestCase(TestBas
         # 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):

Modified: lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py (original)
+++ lldb/trunk/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py Mon Mar 30 09:12:17 2015
@@ -25,7 +25,7 @@ class WatchpointConditionAPITestCase(Tes
         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."""

Modified: lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py (original)
+++ lldb/trunk/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py Mon Mar 30 09:12:17 2015
@@ -22,7 +22,7 @@ class SetWatchlocationAPITestCase(TestBa
         # 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):

Modified: lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py (original)
+++ lldb/trunk/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py Mon Mar 30 09:12:17 2015
@@ -22,7 +22,7 @@ class TargetWatchAddressAPITestCase(Test
         # 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 @@ class TargetWatchAddressAPITestCase(Test
         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):

Modified: lldb/trunk/test/settings/TestSettings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/settings/TestSettings.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/settings/TestSettings.py (original)
+++ lldb/trunk/test/settings/TestSettings.py Mon Mar 30 09:12:17 2015
@@ -199,7 +199,7 @@ class SettingsCommandTestCase(TestBase):
         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."""

Modified: lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py (original)
+++ lldb/trunk/test/tools/lldb-mi/signal/TestMiSignal.py Mon Mar 30 09:12:17 2015
@@ -80,7 +80,7 @@ class MiSignalTestCase(lldbmi_testcase.M
 
     @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 @@ class MiSignalTestCase(lldbmi_testcase.M
 
     @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)."""
 

Modified: lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py (original)
+++ lldb/trunk/test/tools/lldb-mi/stack/TestMiStack.py Mon Mar 30 09:12:17 2015
@@ -238,7 +238,7 @@ class MiStackTestCase(lldbmi_testcase.Mi
     @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."""
 

Modified: lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py (original)
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemoteProcessInfo.py Mon Mar 30 09:12:17 2015
@@ -148,7 +148,7 @@ class TestGdbRemoteProcessInfo(gdbremote
 
         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 @@ class TestGdbRemoteProcessInfo(gdbremote
         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 @@ class TestGdbRemoteProcessInfo(gdbremote
         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 @@ class TestGdbRemoteProcessInfo(gdbremote
         # 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):

Modified: lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py (original)
+++ lldb/trunk/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py Mon Mar 30 09:12:17 2015
@@ -141,7 +141,7 @@ class TestGdbRemote_qThreadStopInfo(gdbr
         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):

Modified: lldb/trunk/test/types/HideTestFailures.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/HideTestFailures.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/types/HideTestFailures.py (original)
+++ lldb/trunk/test/types/HideTestFailures.py Mon Mar 30 09:12:17 2015
@@ -39,7 +39,7 @@ class DebugIntegerTypesFailures(TestBase
         # 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 @@ class DebugIntegerTypesFailures(TestBase
         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 @@ class DebugIntegerTypesFailures(TestBase
         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 @@ class DebugIntegerTypesFailures(TestBase
         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 @@ class DebugIntegerTypesFailures(TestBase
         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'}

Modified: lldb/trunk/test/types/TestFloatTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestFloatTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/types/TestFloatTypes.py (original)
+++ lldb/trunk/test/types/TestFloatTypes.py Mon Mar 30 09:12:17 2015
@@ -6,7 +6,7 @@ import AbstractBase
 import unittest2
 import lldb
 import sys
-from lldbtest import dsym_test, dwarf_test
+from lldbtest import *
 
 class FloatTypesTestCase(AbstractBase.GenericTester):
 
@@ -19,13 +19,13 @@ class FloatTypesTestCase(AbstractBase.Ge
         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 @@ class FloatTypesTestCase(AbstractBase.Ge
         """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."""

Modified: lldb/trunk/test/types/TestFloatTypesExpr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestFloatTypesExpr.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/types/TestFloatTypesExpr.py (original)
+++ lldb/trunk/test/types/TestFloatTypesExpr.py Mon Mar 30 09:12:17 2015
@@ -6,7 +6,7 @@ import AbstractBase
 import unittest2
 import lldb
 import sys
-from lldbtest import dsym_test, dwarf_test
+from lldbtest import *
 
 class FloatTypesExprTestCase(AbstractBase.GenericTester):
 
@@ -22,13 +22,13 @@ class FloatTypesExprTestCase(AbstractBas
         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 @@ class FloatTypesExprTestCase(AbstractBas
         """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."""

Modified: lldb/trunk/test/types/TestIntegerTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestIntegerTypes.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/types/TestIntegerTypes.py (original)
+++ lldb/trunk/test/types/TestIntegerTypes.py Mon Mar 30 09:12:17 2015
@@ -6,7 +6,7 @@ import AbstractBase
 import unittest2
 import lldb
 import sys
-from lldbtest import dsym_test, dwarf_test
+from lldbtest import *
 
 class IntegerTypesTestCase(AbstractBase.GenericTester):
 
@@ -19,13 +19,13 @@ class IntegerTypesTestCase(AbstractBase.
         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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
         """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 @@ class IntegerTypesTestCase(AbstractBase.
     # 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 @@ class IntegerTypesTestCase(AbstractBase.
         """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."""

Modified: lldb/trunk/test/types/TestIntegerTypesExpr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/types/TestIntegerTypesExpr.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/types/TestIntegerTypesExpr.py (original)
+++ lldb/trunk/test/types/TestIntegerTypesExpr.py Mon Mar 30 09:12:17 2015
@@ -6,7 +6,7 @@ import AbstractBase
 import unittest2
 import lldb
 import sys
-from lldbtest import dsym_test, dwarf_test
+from lldbtest import *
 
 class IntegerTypesExprTestCase(AbstractBase.GenericTester):
 
@@ -19,13 +19,13 @@ class IntegerTypesExprTestCase(AbstractB
         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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
         """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 @@ class IntegerTypesExprTestCase(AbstractB
     # 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 @@ class IntegerTypesExprTestCase(AbstractB
         """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."""

Modified: lldb/trunk/test/warnings/uuid/TestAddDsymCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/warnings/uuid/TestAddDsymCommand.py?rev=233547&r1=233546&r2=233547&view=diff
==============================================================================
--- lldb/trunk/test/warnings/uuid/TestAddDsymCommand.py (original)
+++ lldb/trunk/test/warnings/uuid/TestAddDsymCommand.py Mon Mar 30 09:12:17 2015
@@ -5,7 +5,7 @@ import unittest2
 import lldb
 from lldbtest import *
 
- at unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ at skipUnlessDarwin
 class AddDsymCommandCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)



