diff options
Diffstat (limited to 'lldb/test/lang')
76 files changed, 77 insertions, 77 deletions
diff --git a/lldb/test/lang/c/anonymous/TestAnonymous.py b/lldb/test/lang/c/anonymous/TestAnonymous.py index 23246e8994d..7cfb364061d 100644 --- a/lldb/test/lang/c/anonymous/TestAnonymous.py +++ b/lldb/test/lang/c/anonymous/TestAnonymous.py @@ -8,7 +8,7 @@ import lldbutil class AnonymousTestCase(TestBase): - mydir = os.path.join("lang", "c", "anonymous") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_expr_nest_with_dsym(self): diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py index ea638db0ad1..8bb95cbc8a3 100644 --- a/lldb/test/lang/c/array_types/TestArrayTypes.py +++ b/lldb/test/lang/c/array_types/TestArrayTypes.py @@ -8,7 +8,7 @@ import lldbutil class ArrayTypesTestCase(TestBase): - mydir = os.path.join("lang", "c", "array_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py index a88291e84d8..c01625249d3 100644 --- a/lldb/test/lang/c/bitfields/TestBitfields.py +++ b/lldb/test/lang/c/bitfields/TestBitfields.py @@ -8,7 +8,7 @@ import lldbutil class BitfieldsTestCase(TestBase): - mydir = os.path.join("lang", "c", "bitfields") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/blocks/TestBlocks.py b/lldb/test/lang/c/blocks/TestBlocks.py index 124f5f2ed5e..85f3e644466 100644 --- a/lldb/test/lang/c/blocks/TestBlocks.py +++ b/lldb/test/lang/c/blocks/TestBlocks.py @@ -8,7 +8,7 @@ import lldbutil class BlocksTestCase(TestBase): - mydir = os.path.join("lang", "c", "blocks") + mydir = TestBase.compute_mydir(__file__) lines = [] @unittest2.expectedFailure diff --git a/lldb/test/lang/c/const_variables/TestConstVariables.py b/lldb/test/lang/c/const_variables/TestConstVariables.py index 187ed9a7ff5..ce6a8c14960 100644 --- a/lldb/test/lang/c/const_variables/TestConstVariables.py +++ b/lldb/test/lang/c/const_variables/TestConstVariables.py @@ -8,7 +8,7 @@ import lldbutil class ConstVariableTestCase(TestBase): - mydir = os.path.join("lang", "c", "const_variables") + mydir = TestBase.compute_mydir(__file__) @dsym_test @unittest2.expectedFailure(13314878) diff --git a/lldb/test/lang/c/enum_types/TestEnumTypes.py b/lldb/test/lang/c/enum_types/TestEnumTypes.py index e0ec9334267..a0f8217a05b 100644 --- a/lldb/test/lang/c/enum_types/TestEnumTypes.py +++ b/lldb/test/lang/c/enum_types/TestEnumTypes.py @@ -8,7 +8,7 @@ import lldbutil class EnumTypesTestCase(TestBase): - mydir = os.path.join("lang", "c", "enum_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/forward/TestForwardDeclaration.py b/lldb/test/lang/c/forward/TestForwardDeclaration.py index 7ded56c824e..db088ab7d0d 100644 --- a/lldb/test/lang/c/forward/TestForwardDeclaration.py +++ b/lldb/test/lang/c/forward/TestForwardDeclaration.py @@ -8,7 +8,7 @@ import lldbutil class ForwardDeclarationTestCase(TestBase): - mydir = os.path.join("lang", "c", "forward") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/function_types/TestFunctionTypes.py b/lldb/test/lang/c/function_types/TestFunctionTypes.py index a9acced05d0..9b4241cdf36 100644 --- a/lldb/test/lang/c/function_types/TestFunctionTypes.py +++ b/lldb/test/lang/c/function_types/TestFunctionTypes.py @@ -8,7 +8,7 @@ import lldbutil class FunctionTypesTestCase(TestBase): - mydir = os.path.join("lang", "c", "function_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/lang/c/global_variables/TestGlobalVariables.py index 84f1e7c84f7..710782c36f4 100644 --- a/lldb/test/lang/c/global_variables/TestGlobalVariables.py +++ b/lldb/test/lang/c/global_variables/TestGlobalVariables.py @@ -8,7 +8,7 @@ import lldbutil class GlobalVariablesTestCase(TestBase): - mydir = os.path.join("lang", "c", "global_variables") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/set_values/TestSetValues.py b/lldb/test/lang/c/set_values/TestSetValues.py index 5705a04d33c..70a65d7d556 100644 --- a/lldb/test/lang/c/set_values/TestSetValues.py +++ b/lldb/test/lang/c/set_values/TestSetValues.py @@ -8,7 +8,7 @@ import lldbutil class SetValuesTestCase(TestBase): - mydir = os.path.join("lang", "c", "set_values") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/shared_lib/TestSharedLib.py b/lldb/test/lang/c/shared_lib/TestSharedLib.py index cd612e9bcff..c5af5bd48dc 100644 --- a/lldb/test/lang/c/shared_lib/TestSharedLib.py +++ b/lldb/test/lang/c/shared_lib/TestSharedLib.py @@ -8,7 +8,7 @@ import lldbutil class SharedLibTestCase(TestBase): - mydir = os.path.join("lang", "c", "shared_lib") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_expr_with_dsym(self): diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py index a3f7922d638..f8f9b4a616d 100644 --- a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py +++ b/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py @@ -8,7 +8,7 @@ import lldbutil class SharedLibTestCase(TestBase): - mydir = os.path.join("lang", "c", "shared_lib") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_expr_with_dsym(self): diff --git a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py index 41c16e954ed..81a937a6bc6 100644 --- a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py +++ b/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py @@ -8,7 +8,7 @@ from lldbtest import * class TestCStepping(TestBase): - mydir = os.path.join("lang", "c", "stepping") + mydir = TestBase.compute_mydir(__file__) def getCategories(self): return ['basic_process'] diff --git a/lldb/test/lang/c/stepping/TestThreadStepping.py b/lldb/test/lang/c/stepping/TestThreadStepping.py index 8e7952ae8b1..747ef4af314 100644 --- a/lldb/test/lang/c/stepping/TestThreadStepping.py +++ b/lldb/test/lang/c/stepping/TestThreadStepping.py @@ -11,7 +11,7 @@ import lldbutil class ThreadSteppingTestCase(TestBase): - mydir = os.path.join("lang", "c", "stepping") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/strings/TestCStrings.py b/lldb/test/lang/c/strings/TestCStrings.py index 5870451057d..636777e5077 100644 --- a/lldb/test/lang/c/strings/TestCStrings.py +++ b/lldb/test/lang/c/strings/TestCStrings.py @@ -7,7 +7,7 @@ import lldbutil class CStringsTestCase(TestBase): - mydir = os.path.join("lang", "c", "strings") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/c/struct_types/TestStructTypes.py b/lldb/test/lang/c/struct_types/TestStructTypes.py index b9835135355..1ec0ec7c6a9 100644 --- a/lldb/test/lang/c/struct_types/TestStructTypes.py +++ b/lldb/test/lang/c/struct_types/TestStructTypes.py @@ -12,7 +12,7 @@ import lldbutil class StructTypesTestCase(TestBase): - mydir = os.path.join("lang", "c", "struct_types") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/12566646 @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py index f1d56d67f47..1141962d844 100644 --- a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py +++ b/lldb/test/lang/c/tls_globals/TestTlsGlobals.py @@ -8,7 +8,7 @@ import lldbutil class TlsGlobalTestCase(TestBase): - mydir = os.path.join("lang", "c", "tls_globals") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/bool/TestCPPBool.py b/lldb/test/lang/cpp/bool/TestCPPBool.py index 0337cca5aa3..a8ee86e5010 100644 --- a/lldb/test/lang/cpp/bool/TestCPPBool.py +++ b/lldb/test/lang/cpp/bool/TestCPPBool.py @@ -7,7 +7,7 @@ import lldbutil class CPPBoolTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "bool") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/breakpoints/TestCPPBreakpoints.py b/lldb/test/lang/cpp/breakpoints/TestCPPBreakpoints.py index 367d75de811..675e5b42c3f 100644 --- a/lldb/test/lang/cpp/breakpoints/TestCPPBreakpoints.py +++ b/lldb/test/lang/cpp/breakpoints/TestCPPBreakpoints.py @@ -9,7 +9,7 @@ from lldbtest import * class CPPBreakpointTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "breakpoints") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py index c573770334d..a026f14de12 100644 --- a/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py +++ b/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py @@ -8,7 +8,7 @@ import lldbutil class CallCPPFunctionTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "call-function") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py index 97477943649..445c1dd9c9e 100644 --- a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py +++ b/lldb/test/lang/cpp/char1632_t/TestChar1632T.py @@ -11,7 +11,7 @@ import lldbutil class Char1632TestCase(TestBase): - mydir = os.path.join("lang", "cpp", "char1632_t") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py index 248763eb2f1..6ecefd379e9 100644 --- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py +++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py @@ -10,7 +10,7 @@ import lldbutil class StaticVariableTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "class_static") + mydir = TestBase.compute_mydir(__file__) failing_compilers = ['clang', 'gcc'] @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py index 76e8ace4bf1..b41ca399af2 100644 --- a/lldb/test/lang/cpp/class_types/TestClassTypes.py +++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py @@ -9,7 +9,7 @@ import lldbutil class ClassTypesTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "class_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py index d11dba1d044..2e79abc686c 100644 --- a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py +++ b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py @@ -10,7 +10,7 @@ import lldbutil class IterateFrameAndDisassembleTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "class_types") + mydir = TestBase.compute_mydir(__file__) failing_compilers = ['clang', 'gcc'] @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py index c11a3510712..b2afaa57a13 100644 --- a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py +++ b/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py @@ -10,7 +10,7 @@ from lldbtest import * class CppValueCastTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "dynamic-value") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/10808472 SBValue::Cast test case is failing (virtual inheritance) @unittest2.expectedFailure diff --git a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py index 34ecbd3d3dd..b0698d80070 100644 --- a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py +++ b/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py @@ -10,7 +10,7 @@ from lldbtest import * class DynamicValueTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "dynamic-value") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py index 38996740c47..77dbaea56d4 100644 --- a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py +++ b/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py @@ -8,7 +8,7 @@ import lldbutil class CPP11EnumTypesTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "enum_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py index c294b54dd6e..122ff94f5b0 100644 --- a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py +++ b/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py @@ -10,7 +10,7 @@ from lldbtest import * class CPPBreakpointTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "exceptions") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/namespace/TestNamespace.py b/lldb/test/lang/cpp/namespace/TestNamespace.py index ecfa3308f33..e9f78e03676 100644 --- a/lldb/test/lang/cpp/namespace/TestNamespace.py +++ b/lldb/test/lang/cpp/namespace/TestNamespace.py @@ -10,7 +10,7 @@ import lldbutil class NamespaceTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "namespace") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/8668674 @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py b/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py index 634c28c02ed..987b15f3b20 100644 --- a/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py +++ b/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py @@ -8,7 +8,7 @@ import lldbutil class CPPStaticMethodsTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "overloaded-functions") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py index 601c8e9e612..faa04881945 100644 --- a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py +++ b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py @@ -24,7 +24,7 @@ import lldbutil class Rdar12991846TestCase(TestBase): - mydir = os.path.join("lang", "cpp", "rdar12991846") + mydir = TestBase.compute_mydir(__file__) @unittest2.expectedFailure @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py index 9c9f08f19b3..803f7be11b9 100644 --- a/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py +++ b/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py @@ -8,7 +8,7 @@ import lldbutil class RvalueReferencesTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "rvalue-references") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") #rdar://problem/11479676 diff --git a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py index e9de2d909a8..6effad0ffab 100644 --- a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py +++ b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py @@ -11,7 +11,7 @@ import lldbutil class UnsignedTypesTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "signed_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py index a553ff4b537..d49b86a06a6 100644 --- a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py +++ b/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py @@ -7,7 +7,7 @@ import lldbutil class CPPStaticMembersTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "static_members") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @unittest2.expectedFailure # llvm.org/pr15401 diff --git a/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py index 357b050eb7b..25dec6f465b 100644 --- a/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py +++ b/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py @@ -8,7 +8,7 @@ import lldbutil class CPPStaticMethodsTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "static_methods") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/stl/TestSTL.py b/lldb/test/lang/cpp/stl/TestSTL.py index 2c09d6b09dc..ffb02e2e654 100644 --- a/lldb/test/lang/cpp/stl/TestSTL.py +++ b/lldb/test/lang/cpp/stl/TestSTL.py @@ -10,7 +10,7 @@ from lldbtest import * class STLTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "stl") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/10400981 @unittest2.expectedFailure diff --git a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py index 8914e2a78ab..c05c2fce548 100644 --- a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py +++ b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py @@ -10,7 +10,7 @@ import lldbutil class StdCXXDisassembleTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "stl") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/lang/cpp/this/TestCPPThis.py b/lldb/test/lang/cpp/this/TestCPPThis.py index 0cb7404a5ee..62bed20b2d7 100644 --- a/lldb/test/lang/cpp/this/TestCPPThis.py +++ b/lldb/test/lang/cpp/this/TestCPPThis.py @@ -7,7 +7,7 @@ import lldbutil class CPPThisTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "this") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") #rdar://problem/9962849 diff --git a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py index 3579f7a9394..e07c02e0cd0 100644 --- a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py +++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py @@ -9,7 +9,7 @@ from lldbtest import * class UniqueTypesTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "unique-types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py index ddf768ec6e6..66b4a5493a0 100644 --- a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py +++ b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py @@ -11,7 +11,7 @@ import lldbutil class UnsignedTypesTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "unsigned_types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/cpp/virtual/TestVirtual.py b/lldb/test/lang/cpp/virtual/TestVirtual.py index 2d811ab8e1f..4c1fff15e99 100644 --- a/lldb/test/lang/cpp/virtual/TestVirtual.py +++ b/lldb/test/lang/cpp/virtual/TestVirtual.py @@ -13,7 +13,7 @@ def Msg(expr, val): class CppVirtualMadness(TestBase): - mydir = os.path.join("lang", "cpp", "virtual") + mydir = TestBase.compute_mydir(__file__) # This is the pattern by design to match the "my_expr = 'value'" output from # printf() stmts (see main.cpp). diff --git a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py index 52fab1f98cf..3d286d89175 100644 --- a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py +++ b/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py @@ -11,7 +11,7 @@ import lldbutil class CxxWCharTTestCase(TestBase): - mydir = os.path.join("lang", "cpp", "wchar_t") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py index 0213c46b435..40d7bfc3219 100644 --- a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py +++ b/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py @@ -8,7 +8,7 @@ import lldbutil class TestObjCIvarsInBlocks(TestBase): - mydir = os.path.join("lang", "objc", "blocks") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") # This test requires the 2.0 runtime, so it will fail on i386. diff --git a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py index 24ede4cc8df..abcddaeabca 100644 --- a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py +++ b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py @@ -8,7 +8,7 @@ import lldbutil class ForwardDeclTestCase(TestBase): - mydir = os.path.join("lang", "objc", "forward-decl") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/objc/foundation/TestConstStrings.py b/lldb/test/lang/objc/foundation/TestConstStrings.py index e19d09ec309..cafea53402c 100644 --- a/lldb/test/lang/objc/foundation/TestConstStrings.py +++ b/lldb/test/lang/objc/foundation/TestConstStrings.py @@ -12,7 +12,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class ConstStringTestCase(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) d = {'OBJC_SOURCES': 'const-strings.m'} @dsym_test diff --git a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py index 11dda6543b4..b067640e7b3 100644 --- a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py +++ b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class FoundationDisassembleTestCase(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/8504895 # Crash while doing 'disassemble -n "-[NSNumber descriptionWithLocale:]" diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/lang/objc/foundation/TestObjCMethods.py index 380c44802ff..67c96c1c35d 100644 --- a/lldb/test/lang/objc/foundation/TestObjCMethods.py +++ b/lldb/test/lang/objc/foundation/TestObjCMethods.py @@ -12,7 +12,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class FoundationTestCase(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_break_with_dsym(self): diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/lang/objc/foundation/TestObjCMethods2.py index 37e3f1e125b..3385a0f85a5 100644 --- a/lldb/test/lang/objc/foundation/TestObjCMethods2.py +++ b/lldb/test/lang/objc/foundation/TestObjCMethods2.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class FoundationTestCase2(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_more_expr_commands_with_dsym(self): diff --git a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py index 1c42553b526..09a03d4df96 100644 --- a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py +++ b/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py @@ -10,7 +10,7 @@ from lldbtest import * class ObjectDescriptionAPITestCase(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/10857337 @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py index dbdd82f2b4f..0cfa89b13c2 100644 --- a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py +++ b/lldb/test/lang/objc/foundation/TestRuntimeTypes.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class RuntimeTypesTestCase(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_break_with_dsym(self): diff --git a/lldb/test/lang/objc/foundation/TestSymbolTable.py b/lldb/test/lang/objc/foundation/TestSymbolTable.py index c41874a7fca..28b5f73fa7f 100644 --- a/lldb/test/lang/objc/foundation/TestSymbolTable.py +++ b/lldb/test/lang/objc/foundation/TestSymbolTable.py @@ -10,7 +10,7 @@ from lldbtest import * @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class FoundationSymtabTestCase(TestBase): - mydir = os.path.join("lang", "objc", "foundation") + mydir = TestBase.compute_mydir(__file__) symbols_list = ['-[MyString initWithNSString:]', '-[MyString dealloc]', diff --git a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py index 1f50de94106..f8a768c0cf5 100644 --- a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py +++ b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py @@ -8,7 +8,7 @@ import lldbutil class HiddenIvarsTestCase(TestBase): - mydir = os.path.join("lang", "objc", "hidden-ivars") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/objc/objc++/TestObjCXX.py b/lldb/test/lang/objc/objc++/TestObjCXX.py index 484d729d842..0658b849876 100644 --- a/lldb/test/lang/objc/objc++/TestObjCXX.py +++ b/lldb/test/lang/objc/objc++/TestObjCXX.py @@ -10,7 +10,7 @@ import lldbutil class ObjCXXTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc++") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_break_with_dsym(self): diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py index 0a98469e983..6aca65b781f 100644 --- a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py +++ b/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py @@ -10,7 +10,7 @@ from lldbtest import * class ObjCDynamicValueTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-baseclass-sbtype") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py index e0ebee67b1f..b43ad7af907 100644 --- a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py +++ b/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py @@ -8,7 +8,7 @@ from lldbtest import * class TestObjCBuiltinTypes(TestBase): - mydir = os.path.join("lang", "objc", "objc-builtin-types") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py index fd3d76c4414..28659ffd813 100644 --- a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py +++ b/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py @@ -10,7 +10,7 @@ from lldbtest import * class ObjCCheckerTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-checker") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py index c158385a4da..9fc272133d7 100644 --- a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py +++ b/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py @@ -8,7 +8,7 @@ from lldbtest import * class TestObjCClassMethod(TestBase): - mydir = os.path.join("lang", "objc", "objc-class-method") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py index 3d14339e254..335aab39639 100644 --- a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py +++ b/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class ObjCDynamicSBTypeTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-dyn-sbtype") + mydir = TestBase.compute_mydir(__file__) @dsym_test @skipIfi386 diff --git a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py index bd77aa3a974..e679ca27b07 100644 --- a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py +++ b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py @@ -10,7 +10,7 @@ from lldbtest import * class ObjCDynamicValueTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-dynamic-value") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py index b4d7137181e..1df069f00df 100644 --- a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py +++ b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py @@ -8,7 +8,7 @@ import lldbutil class TestObjCIvarOffsets(TestBase): - mydir = os.path.join("lang", "objc", "objc-ivar-offsets") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py index fef0921d896..3a116bbc12a 100644 --- a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py +++ b/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py @@ -8,7 +8,7 @@ import lldbutil class TestObjCIvarStripped(TestBase): - mydir = os.path.join("lang", "objc", "objc-ivar-stripped") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py index 2f1f5b0edd0..b3dcafc9b2d 100644 --- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py +++ b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py @@ -12,7 +12,7 @@ from lldbtest import * class ObjCNewSyntaxTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-new-syntax") + mydir = TestBase.compute_mydir(__file__) @unittest2.expectedFailure @dsym_test diff --git a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py index a7a9d232962..55127c392fd 100644 --- a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py +++ b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py @@ -19,7 +19,7 @@ import re @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class ObjcOptimizedTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-optimized") + mydir = TestBase.compute_mydir(__file__) myclass = "MyClass" mymethod = "description" method_spec = "-[%s %s]" % (myclass, mymethod) diff --git a/lldb/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/test/lang/objc/objc-property/TestObjCProperty.py index dadb7fa291c..2a2bd014cea 100644 --- a/lldb/test/lang/objc/objc-property/TestObjCProperty.py +++ b/lldb/test/lang/objc/objc-property/TestObjCProperty.py @@ -10,7 +10,7 @@ from lldbtest import * class ObjCPropertyTestCase(TestBase): - mydir = os.path.join("lang", "objc", "objc-property") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py index bf7e059313c..c14432c879f 100644 --- a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py +++ b/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py @@ -8,7 +8,7 @@ from lldbtest import * class TestObjCStaticMethodStripped(TestBase): - mydir = os.path.join("lang", "objc", "objc-static-method-stripped") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py index 31968301fba..a89863143fc 100644 --- a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py +++ b/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py @@ -8,7 +8,7 @@ from lldbtest import * class TestObjCStaticMethod(TestBase): - mydir = os.path.join("lang", "objc", "objc-static-method") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py index 48900d24831..8bee8c05de2 100644 --- a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py +++ b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py @@ -11,7 +11,7 @@ class TestObjCStepping(TestBase): def getCategories (self): return ['basic_process'] - mydir = os.path.join("lang", "objc", "objc-stepping") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py index 788310bcba9..8490d1c73b1 100644 --- a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py +++ b/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py @@ -8,7 +8,7 @@ from lldbtest import * class TestObjCClassMethod(TestBase): - mydir = os.path.join("lang", "objc", "objc-class-method") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test @@ -30,7 +30,7 @@ class TestObjCClassMethod(TestBase): # Call super's setUp(). TestBase.setUp(self) # Find the line numbers to break inside main(). - self.main_source = "class.m" + self.main_source = "test.m" self.break_line = line_number(self.main_source, '// Set breakpoint here.') def objc_class_method(self): diff --git a/lldb/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/test/lang/objc/objc-super/TestObjCSuper.py index 746e29cf4b5..15b5218f28c 100644 --- a/lldb/test/lang/objc/objc-super/TestObjCSuper.py +++ b/lldb/test/lang/objc/objc-super/TestObjCSuper.py @@ -8,7 +8,7 @@ from lldbtest import * class TestObjCSuperMethod(TestBase): - mydir = os.path.join("lang", "objc", "objc-super") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailurei386 diff --git a/lldb/test/lang/objc/print-obj/TestPrintObj.py b/lldb/test/lang/objc/print-obj/TestPrintObj.py index 66b59581a61..acd4f7d9b29 100644 --- a/lldb/test/lang/objc/print-obj/TestPrintObj.py +++ b/lldb/test/lang/objc/print-obj/TestPrintObj.py @@ -10,7 +10,7 @@ from lldbtest import * @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class PrintObjTestCase(TestBase): - mydir = os.path.join("lang", "objc", "print-obj") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_print_obj_with_dsym(self): diff --git a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py index 8f48196fb1a..20aecdec3c8 100644 --- a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py +++ b/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class MethodReturningBOOLTestCase(TestBase): - mydir = os.path.join("lang", "objc", "radar-9691614") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_method_ret_BOOL_with_dsym(self): diff --git a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py index 15e843b34bf..ecc80ebc402 100644 --- a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py +++ b/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class Rdar10967107TestCase(TestBase): - mydir = os.path.join("lang", "objc", "rdar-10967107") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_cfrange_diff_cfgregoriandate_with_dsym(self): diff --git a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py index 1dbf680d675..165948d16e0 100644 --- a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py +++ b/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class Rdar10967107TestCase(TestBase): - mydir = os.path.join("lang", "objc", "rdar-11355592") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_charstar_dyntype_with_dsym(self): diff --git a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py index 7f884248f6e..caae8963ee7 100644 --- a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py +++ b/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class Rdar12408181TestCase(TestBase): - mydir = os.path.join("lang", "objc", "rdar-12408181") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_nswindow_count_with_dsym(self): diff --git a/lldb/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/lang/objc/real-definition/TestRealDefinition.py index 8530f3570cb..dd476fc37d3 100644 --- a/lldb/test/lang/objc/real-definition/TestRealDefinition.py +++ b/lldb/test/lang/objc/real-definition/TestRealDefinition.py @@ -8,7 +8,7 @@ import lldbutil class TestRealDefinition(TestBase): - mydir = os.path.join("lang", "objc", "real-definition") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/lang/objc/self/TestObjCSelf.py b/lldb/test/lang/objc/self/TestObjCSelf.py index e7733ab2e74..cc58bf2185f 100644 --- a/lldb/test/lang/objc/self/TestObjCSelf.py +++ b/lldb/test/lang/objc/self/TestObjCSelf.py @@ -7,7 +7,7 @@ import lldbutil class ObjCSelfTestCase(TestBase): - mydir = os.path.join("lang", "objc", "self") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test |
