diff options
| author | Greg Clayton <gclayton@apple.com> | 2013-12-10 23:19:29 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2013-12-10 23:19:29 +0000 |
| commit | 4570d3eba0db0e322115964257f36a086d89edcb (patch) | |
| tree | fb45581bcbcca8498dafa485def3d4e85383307a /lldb/test/functionalities | |
| parent | 88b6898085e8b7d5a577eb0cfb16bf489842324c (diff) | |
| download | bcm5719-llvm-4570d3eba0db0e322115964257f36a086d89edcb.tar.gz bcm5719-llvm-4570d3eba0db0e322115964257f36a086d89edcb.zip | |
Massive test suite cleanup to stop everyone from manually having to compute "mydir" inside each test case.
This has led to many test suite failures because of copy and paste where new test cases were based off of other test cases and the "mydir" variable wasn't updated.
Now you can call your superclasses "compute_mydir()" function with "__file__" as the sole argument and the relative path will be computed for you.
llvm-svn: 196985
Diffstat (limited to 'lldb/test/functionalities')
116 files changed, 116 insertions, 116 deletions
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py index 38b9005537a..c8641506734 100644 --- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py +++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py @@ -10,7 +10,7 @@ import lldbutil class AbbreviationsTestCase(TestBase): - mydir = os.path.join("functionalities", "abbreviation") + mydir = TestBase.compute_mydir(__file__) def test_nonrunning_command_abbreviations (self): self.expect("ap script", diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py index 6782f701d88..ec322db1c2d 100644 --- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py +++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py @@ -11,7 +11,7 @@ import lldbutil class CommonShortSpellingsTestCase(TestBase): - mydir = os.path.join("functionalities", "abbreviation") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/alias/TestAliases.py b/lldb/test/functionalities/alias/TestAliases.py index 590e0ac5618..3713209e1b4 100644 --- a/lldb/test/functionalities/alias/TestAliases.py +++ b/lldb/test/functionalities/alias/TestAliases.py @@ -10,7 +10,7 @@ import lldbutil class AliasTestCase(TestBase): - mydir = os.path.join("functionalities", "alias") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/archives/TestBSDArchives.py b/lldb/test/functionalities/archives/TestBSDArchives.py index 46871753c93..632b9819070 100644 --- a/lldb/test/functionalities/archives/TestBSDArchives.py +++ b/lldb/test/functionalities/archives/TestBSDArchives.py @@ -8,7 +8,7 @@ import lldbutil class BSDArchivesTestCase(TestBase): - mydir = os.path.join("functionalities", "archives") + mydir = TestBase.compute_mydir(__file__) def test_with_dwarf(self): """Break inside a() and b() defined within libfoo.a.""" diff --git a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py index d42fbe76ee5..7c8cf86341f 100644 --- a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py +++ b/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py @@ -9,7 +9,7 @@ from lldbtest import * class BackticksWithNoTargetTestCase(TestBase): - mydir = "functionalities/backticks" + mydir = TestBase.compute_mydir(__file__) def test_backticks_no_target(self): """A simple test of backticks without a target.""" diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py index a5e66b319e8..4b5e9830f22 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -10,7 +10,7 @@ import lldbutil class BreakpointCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "breakpoint", "breakpoint_command") + mydir = TestBase.compute_mydir(__file__) @classmethod def classCleanup(cls): diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py index aa273692b4d..26764fabcef 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py @@ -10,7 +10,7 @@ import lldbutil class RegexpBreakCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "breakpoint", "breakpoint_command") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py index 25a9ed15aab..95a515efd10 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py @@ -10,7 +10,7 @@ from lldbtest import * class BreakpointConditionsTestCase(TestBase): - mydir = os.path.join("functionalities", "breakpoint", "breakpoint_conditions") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py index 15e79c25ccf..89d90362eab 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py @@ -10,7 +10,7 @@ import lldbutil class BreakpointIDTestCase(TestBase): - mydir = os.path.join("functionalities", "breakpoint", "breakpoint_ids") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py index c256562ec0e..c673a3b690a 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py @@ -10,7 +10,7 @@ from lldbtest import * class BreakpointIgnoreCountTestCase(TestBase): - mydir = os.path.join("functionalities", "breakpoint", "breakpoint_ignore_count") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py index e6896c3894c..79c6a4ccdce 100644 --- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py +++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py @@ -10,7 +10,7 @@ import lldbutil class BreakpointLocationsTestCase(TestBase): - mydir = os.path.join("functionalities", "breakpoint", "breakpoint_locations") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py index fc4084124cc..d3dc055fa9e 100644 --- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py +++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py @@ -12,7 +12,7 @@ import lldbutil class InlinedBreakpointsTestCase(TestBase): """Bug fixed: rdar://problem/8464339""" - mydir = os.path.join("functionalities", "breakpoint", "inlined_breakpoints") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/command_history/TestCommandHistory.py b/lldb/test/functionalities/command_history/TestCommandHistory.py index 4ed7c579c4b..ac88e330e0f 100644 --- a/lldb/test/functionalities/command_history/TestCommandHistory.py +++ b/lldb/test/functionalities/command_history/TestCommandHistory.py @@ -10,7 +10,7 @@ from lldbtest import * class CommandHistoryTestCase(TestBase): - mydir = os.path.join("functionalities", "command_history") + mydir = TestBase.compute_mydir(__file__) def test_history(self): self.runCmd('command history --clear', inHistory=False) diff --git a/lldb/test/functionalities/command_regex/TestCommandRegex.py b/lldb/test/functionalities/command_regex/TestCommandRegex.py index c2fe66b1cbd..6052b0f7f64 100644 --- a/lldb/test/functionalities/command_regex/TestCommandRegex.py +++ b/lldb/test/functionalities/command_regex/TestCommandRegex.py @@ -10,7 +10,7 @@ from lldbtest import * class CommandRegexTestCase(TestBase): - mydir = os.path.join("functionalities", "command_regex") + mydir = TestBase.compute_mydir(__file__) def test_command_regex(self): """Test a simple scenario of 'command regexp' invocation and subsequent use.""" diff --git a/lldb/test/functionalities/command_script/TestCommandScript.py b/lldb/test/functionalities/command_script/TestCommandScript.py index bbc9e783565..63f67b24d86 100644 --- a/lldb/test/functionalities/command_script/TestCommandScript.py +++ b/lldb/test/functionalities/command_script/TestCommandScript.py @@ -9,7 +9,7 @@ from lldbtest import * class CmdPythonTestCase(TestBase): - mydir = os.path.join("functionalities", "command_script") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/command_script/import/TestImport.py b/lldb/test/functionalities/command_script/import/TestImport.py index 07b0b07d82d..393285b7c6c 100644 --- a/lldb/test/functionalities/command_script/import/TestImport.py +++ b/lldb/test/functionalities/command_script/import/TestImport.py @@ -7,7 +7,7 @@ from lldbtest import * class ImportTestCase(TestBase): - mydir = os.path.join("functionalities", "command_script", "import") + mydir = TestBase.compute_mydir(__file__) @python_api_test def test_import_command(self): diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py index dc4790605b2..e940261f4d2 100644 --- a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py +++ b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py @@ -7,7 +7,7 @@ from lldbtest import * class Rdar12586188TestCase(TestBase): - mydir = os.path.join("functionalities", "command_script", "import", "rdar-12586188") + mydir = TestBase.compute_mydir(__file__) @python_api_test def test_rdar12586188_command(self): diff --git a/lldb/test/functionalities/command_source/TestCommandSource.py b/lldb/test/functionalities/command_source/TestCommandSource.py index 26138bb31be..c3eeee6fc56 100644 --- a/lldb/test/functionalities/command_source/TestCommandSource.py +++ b/lldb/test/functionalities/command_source/TestCommandSource.py @@ -11,7 +11,7 @@ from lldbtest import * class CommandSourceTestCase(TestBase): - mydir = os.path.join("functionalities", "command_source") + mydir = TestBase.compute_mydir(__file__) def test_command_source(self): """Test that lldb command "command source" works correctly.""" diff --git a/lldb/test/functionalities/completion/TestCompletion.py b/lldb/test/functionalities/completion/TestCompletion.py index 2017a3090f4..7d99448a9df 100644 --- a/lldb/test/functionalities/completion/TestCompletion.py +++ b/lldb/test/functionalities/completion/TestCompletion.py @@ -10,7 +10,7 @@ from lldbtest import * class CommandLineCompletionTestCase(TestBase): - mydir = os.path.join("functionalities", "completion") + mydir = TestBase.compute_mydir(__file__) @classmethod def classCleanup(cls): diff --git a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py index ed0a8042d7f..d6644323bdd 100644 --- a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py +++ b/lldb/test/functionalities/conditional_break/TestConditionalBreak.py @@ -15,7 +15,7 @@ from lldbtest import * class ConditionalBreakTestCase(TestBase): - mydir = os.path.join("functionalities", "conditional_break") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/functionalities/connect_remote/TestConnectRemote.py b/lldb/test/functionalities/connect_remote/TestConnectRemote.py index fa32db4d177..3168285cd0f 100644 --- a/lldb/test/functionalities/connect_remote/TestConnectRemote.py +++ b/lldb/test/functionalities/connect_remote/TestConnectRemote.py @@ -10,7 +10,7 @@ from lldbtest import * class ConnectRemoteTestCase(TestBase): - mydir = os.path.join("functionalities", "connect_remote") + mydir = TestBase.compute_mydir(__file__) def test_connect_remote(self): """Test "process connect connect:://localhost:12345".""" diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py index 30a76928ea8..694ced9fc4b 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py @@ -10,7 +10,7 @@ import lldbutil class AdvDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-advanced") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py index 389a5e06e60..18b9837aca0 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py @@ -10,7 +10,7 @@ import lldbutil class CategoriesDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-categories") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py index 78dc41086d0..2d6f888339b 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py @@ -10,7 +10,7 @@ import lldbutil class CppDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-cpp") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py index cde9a4ec18a..d5a911a29a3 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py @@ -10,7 +10,7 @@ import lldbutil class DataFormatterDisablingTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-disabling") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py index 47e7f71ef84..b8feee71b24 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py @@ -10,7 +10,7 @@ import lldbutil class GlobalsDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-globals") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py index 6ab7f93067c..3564f6b3f4d 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py @@ -10,7 +10,7 @@ import lldbutil class NamedSummariesDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-named-summaries") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py index 53590667e51..de5c3f29902 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py @@ -12,7 +12,7 @@ import lldbutil class ObjCDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-objc") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py index 8bd276e47da..a44784a4db9 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py @@ -10,7 +10,7 @@ import lldbutil class PythonSynthDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-python-synth") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py index 2d167ac63bf..213951385e0 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py @@ -10,7 +10,7 @@ import lldbutil class ScriptDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-script") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py index 2c203f647ec..b59f9f072b6 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py @@ -10,7 +10,7 @@ import lldbutil class SkipSummaryDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-skip-summary") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py index 27ca2e1361c..9bebfa5904a 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py @@ -10,7 +10,7 @@ import lldbutil class SmartArrayDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-smart-array") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py index 80157496a85..3a5fde1000f 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxIteratorDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "iterator") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py index 6939d79a526..9b3dd02d365 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxListDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "list") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py index a4668b5cfac..17ac44fc460 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxMapDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "map") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py index 8eddf1ce50c..bd4e7cef3fb 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxMultiMapDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "multimap") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py index 67db56026bf..84f1eb82575 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxMultiSetDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "multiset") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py index a60f7d11370..7c2b77e932f 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxSetDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "set") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py index 7b032f9ac6e..e906ead7a78 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -11,7 +11,7 @@ import lldbutil class LibcxxStringDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "string") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py index a5665534627..ac03705d105 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxMultiMapDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "unordered") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py index a1bc5d00c6d..799fb16c1d7 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxVBoolDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "vbool") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py index 56ab1394805..527bc264097 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py @@ -10,7 +10,7 @@ import lldbutil class LibcxxVectorDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libcxx", "vector") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py index bf1a1af1d92..4d072e6a2d4 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py @@ -10,7 +10,7 @@ import lldbutil class StdIteratorDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libstdcpp", "iterator") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py index 39b94f0e2a8..dea3871c05b 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py @@ -10,7 +10,7 @@ import lldbutil class StdListDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libstdcpp", "list") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py index 1b0cc815802..414b5a0b6b8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py @@ -10,7 +10,7 @@ import lldbutil class StdMapDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libstdcpp", "map") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py index 52526d00837..56855a296a8 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -11,7 +11,7 @@ import lldbutil class StdStringDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libstdcpp", "string") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py index 293c5d6fdb6..eb831ebb75c 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py @@ -10,7 +10,7 @@ import lldbutil class StdVBoolDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libstdcpp", "vbool") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py index 773ce6ef9c0..161cb2f7a86 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py @@ -10,7 +10,7 @@ import lldbutil class StdVectorDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-stl", "libstdcpp", "vector") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py index bd96049f574..9c3bed1828a 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py @@ -10,7 +10,7 @@ import lldbutil class SynthDataFormatterTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "data-formatter-synth") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py index 3c245123794..b8a7ba3a438 100644 --- a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py +++ b/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py @@ -10,7 +10,7 @@ import lldbutil class FormatPropagationTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "format-propagation") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/14035604 @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py b/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py index 15e1f7c67c5..cb463c94f5e 100644 --- a/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py +++ b/lldb/test/functionalities/data-formatter/rdar-10449092/Test-rdar-10449092.py @@ -11,7 +11,7 @@ import lldbutil class Radar10449092DataFormatterTestCase(TestBase): # test for rdar://problem/10449092 () - mydir = os.path.join("functionalities", "data-formatter", "rdar-10449092") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py b/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py index 02dd44705f6..5af70a8e415 100644 --- a/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py +++ b/lldb/test/functionalities/data-formatter/rdar-10642615/Test-rdar-10642615.py @@ -11,7 +11,7 @@ import lldbutil class Radar10642615DataFormatterTestCase(TestBase): # test for rdar://problem/10642615 () - mydir = os.path.join("functionalities", "data-formatter", "rdar-10642615") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py b/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py index 16db113d483..a662f142104 100644 --- a/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py +++ b/lldb/test/functionalities/data-formatter/rdar-10887661/TestRdar10887661.py @@ -10,7 +10,7 @@ import lldbutil class Rdar10887661TestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-10887661") + mydir = TestBase.compute_mydir(__file__) # rdar://problem/10887661 @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py b/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py index e31572817b5..3f6dc27b634 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py +++ b/lldb/test/functionalities/data-formatter/rdar-11086338/TestRdar11086338.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterRdar11086338TestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-11086338") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py index 0d417a2dc24..a3b90823473 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py +++ b/lldb/test/functionalities/data-formatter/rdar-11628688/TestFormattersBoolRefPtr.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterOSTypeTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-11628688") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py b/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py index f2a76f8eff9..99e6953b6ba 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py +++ b/lldb/test/functionalities/data-formatter/rdar-11773899/TestFormattersBoolRefPtr.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterBoolRefPtr(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-11773899") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py b/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py index 38226ca14da..4a8829f2079 100644 --- a/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py +++ b/lldb/test/functionalities/data-formatter/rdar-11988289/TestRdar 11988289.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterRdar11988289TestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-11988289") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py b/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py index 2205dfd4e7e..86d88ab0b03 100644 --- a/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py +++ b/lldb/test/functionalities/data-formatter/rdar-12437442/TestRdar12437442.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterRdar12437442TestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-12437442") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py b/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py index dc3cfb437d7..326c5d60c29 100644 --- a/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py +++ b/lldb/test/functionalities/data-formatter/rdar-12529957/TestRdar12529957.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterRdar12529957TestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-12529957") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py b/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py index e65cb8b3d5c..cc936ba03bb 100644 --- a/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py +++ b/lldb/test/functionalities/data-formatter/rdar-13338477/Test-rdar-13338477.py @@ -11,7 +11,7 @@ import lldbutil class Radar13338477DataFormatterTestCase(TestBase): # test for rdar://problem/13338477 () - mydir = os.path.join("functionalities", "data-formatter", "rdar-13338477") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py b/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py index de274331451..42026ef9f2b 100644 --- a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py +++ b/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py @@ -11,7 +11,7 @@ import lldbutil class DataFormatterOneIsSingularTestCase(TestBase): - mydir = os.path.join("functionalities", "data-formatter", "rdar-3534688") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py index 0aa619bf0f3..aa9772b69ef 100644 --- a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py +++ b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py @@ -11,7 +11,7 @@ import lldbutil class Radar9973865DataFormatterTestCase(TestBase): # test for rdar://problem/9973865 (If you use "${var}" in the summary string for an aggregate type, the summary doesn't print for a pointer to that type) - mydir = os.path.join("functionalities", "data-formatter", "rdar-9973865") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py b/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py index e4142b6bbc0..81bc93cade5 100644 --- a/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py +++ b/lldb/test/functionalities/data-formatter/rdar-9973992/Test-rdar-9973992.py @@ -11,7 +11,7 @@ import lldbutil class Radar9973992DataFormatterTestCase(TestBase): # test for rdar://problem/9973992 (What should we do for "${var}" in summaries of aggregate types?) - mydir = os.path.join("functionalities", "data-formatter", "rdar-9973992") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py b/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py index 8aa2d112bd6..a03a07a183c 100644 --- a/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py +++ b/lldb/test/functionalities/data-formatter/rdar-9974002/Test-rdar-9974002.py @@ -11,7 +11,7 @@ import lldbutil class Radar9974002DataFormatterTestCase(TestBase): # test for rdar://problem/9974002 () - mydir = os.path.join("functionalities", "data-formatter", "rdar-9974002") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/functionalities/dead-strip/TestDeadStrip.py index 6da02fbf28d..1371953b32f 100644 --- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py +++ b/lldb/test/functionalities/dead-strip/TestDeadStrip.py @@ -10,7 +10,7 @@ import lldbutil class DeadStripTestCase(TestBase): - mydir = os.path.join("functionalities", "dead-strip") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py index 5ab7ada2032..71870e324aa 100644 --- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py +++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py @@ -8,7 +8,7 @@ from lldbtest import * class ConvenienceVariablesCase(TestBase): - mydir = os.path.join("functionalities", "embedded_interpreter") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/exec/TestExec.py b/lldb/test/functionalities/exec/TestExec.py index e9a0dca7446..9d5ad1b3279 100644 --- a/lldb/test/functionalities/exec/TestExec.py +++ b/lldb/test/functionalities/exec/TestExec.py @@ -19,7 +19,7 @@ def execute_command (command): class ExecTestCase(TestBase): - mydir = os.path.join("functionalities", "exec") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py index 4af70bb0638..5862a347deb 100644 --- a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py +++ b/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py @@ -13,7 +13,7 @@ class ExprDoesntDeadlockTestCase(TestBase): def getCategories(self): return ['basic_process'] - mydir = os.path.join("functionalities", "expr-doesnt-deadlock") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/fat_archives/TestFatArchives.py b/lldb/test/functionalities/fat_archives/TestFatArchives.py index 13146edd724..a878cc4c5d9 100644 --- a/lldb/test/functionalities/fat_archives/TestFatArchives.py +++ b/lldb/test/functionalities/fat_archives/TestFatArchives.py @@ -19,7 +19,7 @@ def execute_command (command): class FatArchiveTestCase(TestBase): - mydir = os.path.join("functionalities", "fat_archives") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dwarf_test diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py index 1dc5aad2ca6..9c6dd6f21ab 100644 --- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py +++ b/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py @@ -7,7 +7,7 @@ from lldbtest import * class AssertingInferiorTestCase(TestBase): - mydir = os.path.join("functionalities", "inferior-assert") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @unittest2.expectedFailure("rdar://15367233") diff --git a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py index fb01e9a2d6a..883be93a6f5 100644 --- a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py +++ b/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py @@ -8,7 +8,7 @@ import lldbutil class ChangedInferiorTestCase(TestBase): - mydir = os.path.join("functionalities", "inferior-changed") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") def test_inferior_crashing_dsym(self): diff --git a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py index e807224112a..af0abae467d 100644 --- a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py +++ b/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py @@ -7,7 +7,7 @@ from lldbtest import * class CrashingInferiorTestCase(TestBase): - mydir = os.path.join("functionalities", "inferior-crashing") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") def test_inferior_crashing_dsym(self): diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py index ac44528e15c..f79e99d4766 100644 --- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py +++ b/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py @@ -7,7 +7,7 @@ from lldbtest import * class CrashingRecursiveInferiorTestCase(TestBase): - mydir = os.path.join("functionalities", "inferior-crashing", "recursive-inferior") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") def test_recursive_inferior_crashing_dsym(self): diff --git a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py index 6726090a29b..a13331bf61e 100644 --- a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py +++ b/lldb/test/functionalities/inline-stepping/TestInlineStepping.py @@ -8,7 +8,7 @@ from lldbtest import * class TestInlineStepping(TestBase): - mydir = os.path.join("functionalities", "inline-stepping") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/functionalities/load_unload/TestLoadUnload.py b/lldb/test/functionalities/load_unload/TestLoadUnload.py index b54c2da4aed..96e0e16204f 100644 --- a/lldb/test/functionalities/load_unload/TestLoadUnload.py +++ b/lldb/test/functionalities/load_unload/TestLoadUnload.py @@ -14,7 +14,7 @@ class LoadUnloadTestCase(TestBase): def getCategories (self): return ['basic_process'] - mydir = os.path.join("functionalities", "load_unload") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/longjmp/TestLongjmp.py b/lldb/test/functionalities/longjmp/TestLongjmp.py index 48b17cb8e69..c7f3bf0a092 100644 --- a/lldb/test/functionalities/longjmp/TestLongjmp.py +++ b/lldb/test/functionalities/longjmp/TestLongjmp.py @@ -10,7 +10,7 @@ from lldbtest import * class LongjmpTestCase(TestBase): - mydir = os.path.join("functionalities", "longjmp") + mydir = TestBase.compute_mydir(__file__) def setUp(self): TestBase.setUp(self) diff --git a/lldb/test/functionalities/memory/read/TestMemoryRead.py b/lldb/test/functionalities/memory/read/TestMemoryRead.py index dbbc9b88793..a9fe6c27965 100644 --- a/lldb/test/functionalities/memory/read/TestMemoryRead.py +++ b/lldb/test/functionalities/memory/read/TestMemoryRead.py @@ -11,7 +11,7 @@ import lldbutil class MemoryReadTestCase(TestBase): - mydir = os.path.join("functionalities", "memory", "read") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py index 55c618432c6..d2a127e999d 100644 --- a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py +++ b/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py @@ -8,7 +8,7 @@ import lldbutil class NonOverlappingIndexVariableCase(TestBase): - mydir = os.path.join("functionalities", "non-overlapping-index-variable-i") + mydir = TestBase.compute_mydir(__file__) def setUp(self): TestBase.setUp(self) diff --git a/lldb/test/functionalities/platform/TestPlatformCommand.py b/lldb/test/functionalities/platform/TestPlatformCommand.py index 3fe776e07d7..e1ea9377acd 100644 --- a/lldb/test/functionalities/platform/TestPlatformCommand.py +++ b/lldb/test/functionalities/platform/TestPlatformCommand.py @@ -9,7 +9,7 @@ from lldbtest import * class PlatformCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "platform") + mydir = TestBase.compute_mydir(__file__) def test_help_platform(self): self.runCmd("help platform") diff --git a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py index e306ebb7128..a73f00ca1c6 100644 --- a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py +++ b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py @@ -11,7 +11,7 @@ import lldbutil class PluginCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "plugins", "commands") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/process_attach/TestProcessAttach.py b/lldb/test/functionalities/process_attach/TestProcessAttach.py index 6e33eaa342e..b7e7604238f 100644 --- a/lldb/test/functionalities/process_attach/TestProcessAttach.py +++ b/lldb/test/functionalities/process_attach/TestProcessAttach.py @@ -10,7 +10,7 @@ import lldbutil class ProcessAttachTestCase(TestBase): - mydir = os.path.join("functionalities", "process_attach") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/test/functionalities/process_launch/TestProcessLaunch.py index e7f83d1818b..a648978862a 100644 --- a/lldb/test/functionalities/process_launch/TestProcessLaunch.py +++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py @@ -9,7 +9,7 @@ from lldbtest import * class ProcessLaunchTestCase(TestBase): - mydir = os.path.join("functionalities", "process_launch") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py index 1bca9999ea9..e20ee9bd5b6 100644 --- a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py +++ b/lldb/test/functionalities/recursion/TestValueObjectRecursion.py @@ -10,7 +10,7 @@ import lldbutil class ValueObjectRecursionTestCase(TestBase): - mydir = os.path.join("functionalities", "recursion") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/register/TestRegisters.py b/lldb/test/functionalities/register/TestRegisters.py index 01e09907431..34530ab3c91 100644 --- a/lldb/test/functionalities/register/TestRegisters.py +++ b/lldb/test/functionalities/register/TestRegisters.py @@ -11,7 +11,7 @@ import lldbutil class RegisterCommandsTestCase(TestBase): - mydir = os.path.join("functionalities", "register") + mydir = TestBase.compute_mydir(__file__) def setUp(self): TestBase.setUp(self) diff --git a/lldb/test/functionalities/return-value/TestReturnValue.py b/lldb/test/functionalities/return-value/TestReturnValue.py index c520c503458..ff138f2a245 100644 --- a/lldb/test/functionalities/return-value/TestReturnValue.py +++ b/lldb/test/functionalities/return-value/TestReturnValue.py @@ -10,7 +10,7 @@ from lldbtest import * class ReturnValueTestCase(TestBase): - mydir = os.path.join("functionalities", "return-value") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailurei386 diff --git a/lldb/test/functionalities/set-data/TestSetData.py b/lldb/test/functionalities/set-data/TestSetData.py index 166ef6706fc..d94d3e870db 100644 --- a/lldb/test/functionalities/set-data/TestSetData.py +++ b/lldb/test/functionalities/set-data/TestSetData.py @@ -11,7 +11,7 @@ import lldbutil @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") class SetDataTestCase(TestBase): - mydir = os.path.join("functionalities", "set-data") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_set_data_dsym(self): diff --git a/lldb/test/functionalities/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py index 0c51224ca3d..f5868291468 100644 --- a/lldb/test/functionalities/signal/TestSendSignal.py +++ b/lldb/test/functionalities/signal/TestSendSignal.py @@ -8,7 +8,7 @@ import lldbutil class SendSignalTestCase(TestBase): - mydir = os.path.join("functionalities", "signal") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py index eb7abc27653..ba696ad9c31 100644 --- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py +++ b/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py @@ -10,7 +10,7 @@ from lldbtest import * class SingleQuoteInCommandLineTestCase(TestBase): - mydir = os.path.join("functionalities", "single-quote-in-filename-to-lldb") + mydir = TestBase.compute_mydir(__file__) myexe = "path with '09/a.out" @classmethod diff --git a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py index 8ef3bf50a81..0605dee7af4 100644 --- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py +++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py @@ -11,7 +11,7 @@ import lldbutil class StopHookCmdTestCase(TestBase): - mydir = os.path.join("functionalities", "stop-hook") + mydir = TestBase.compute_mydir(__file__) # Regression test. def test_not_crashing_if_no_target(self): diff --git a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py index 29573048208..fd2ef83210f 100644 --- a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py +++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py @@ -10,7 +10,7 @@ from lldbtest import * class StopHookMechanismTestCase(TestBase): - mydir = os.path.join("functionalities", "stop-hook") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py index b7f2b53e5bb..f2a90e0ac5e 100644 --- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py +++ b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py @@ -10,7 +10,7 @@ from lldbtest import * class StopHookForMultipleThreadsTestCase(TestBase): - mydir = os.path.join("functionalities", "stop-hook", "multiple_threads") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/target_command/TestTargetCommand.py b/lldb/test/functionalities/target_command/TestTargetCommand.py index 5b656f7fffd..694f7e155e5 100644 --- a/lldb/test/functionalities/target_command/TestTargetCommand.py +++ b/lldb/test/functionalities/target_command/TestTargetCommand.py @@ -10,7 +10,7 @@ import lldbutil class targetCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "target_command") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/test/functionalities/thread/TestNumThreads.py index 011e20a7fc5..c6d7bb5871c 100644 --- a/lldb/test/functionalities/thread/TestNumThreads.py +++ b/lldb/test/functionalities/thread/TestNumThreads.py @@ -10,7 +10,7 @@ import lldbutil class NumberOfThreadsTestCase(TestBase): - mydir = os.path.join("functionalities", "thread") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py index 0cc34247c98..24db482991d 100644 --- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -10,7 +10,7 @@ import lldbutil class BreakpointAfterJoinTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "break_after_join") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained diff --git a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py index b565d0abbef..a217e4a81c2 100644 --- a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py +++ b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py @@ -25,7 +25,7 @@ signal_names = dict((getattr(signal, n), n) \ class ConcurrentEventsTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "concurrent_events") + mydir = TestBase.compute_mydir(__file__) # ## Tests for multiple threads that generate a single event. diff --git a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py index fc5d01c15ef..530efafff88 100644 --- a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py +++ b/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py @@ -10,7 +10,7 @@ import lldbutil class CreateAfterAttachTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "create_after_attach") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py index fd7fe0ca973..e98c19b9ee9 100644 --- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py +++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py @@ -10,7 +10,7 @@ import lldbutil class CreateDuringStepTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "create_during_step") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py index 9aec8b0dd89..1726f2ff98d 100644 --- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -10,7 +10,7 @@ import lldbutil class ExitDuringBreakpointTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "exit_during_break") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py index db23bee546f..4a4718a529a 100644 --- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -10,7 +10,7 @@ import lldbutil class ExitDuringStepTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "exit_during_step") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained diff --git a/lldb/test/functionalities/thread/jump/TestThreadJump.py b/lldb/test/functionalities/thread/jump/TestThreadJump.py index 47e48fd0568..f2122be9126 100644 --- a/lldb/test/functionalities/thread/jump/TestThreadJump.py +++ b/lldb/test/functionalities/thread/jump/TestThreadJump.py @@ -10,7 +10,7 @@ import lldbutil class ThreadJumpTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "jump") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py index ca76f05707d..d3a627bb2c5 100644 --- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py +++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py @@ -10,7 +10,7 @@ import lldbutil class MultipleBreakpointTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "multi_break") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/functionalities/thread/state/TestThreadStates.py index 7bdb91b98fe..4209893e772 100644 --- a/lldb/test/functionalities/thread/state/TestThreadStates.py +++ b/lldb/test/functionalities/thread/state/TestThreadStates.py @@ -10,7 +10,7 @@ import lldbutil class ThreadStateTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "state") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py index 9e47282aaed..40c0afd6e39 100644 --- a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py +++ b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py @@ -10,7 +10,7 @@ import lldbutil class ThreadStepOutTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "step_out") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_step_single_thread_with_dsym(self): diff --git a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py index e6d0273fe50..1e30185cbdb 100644 --- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py +++ b/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py @@ -10,7 +10,7 @@ import lldbutil class ThreadExitTestCase(TestBase): - mydir = os.path.join("functionalities", "thread", "thread_exit") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained diff --git a/lldb/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/test/functionalities/type_completion/TestTypeCompletion.py index 57ee91d7223..cdc637ee1fc 100644 --- a/lldb/test/functionalities/type_completion/TestTypeCompletion.py +++ b/lldb/test/functionalities/type_completion/TestTypeCompletion.py @@ -10,7 +10,7 @@ import lldbutil class TypeCompletionTestCase(TestBase): - mydir = os.path.join("functionalities", "type_completion") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py index 61541dc44e8..2245d8599f4 100644 --- a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py +++ b/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py @@ -11,7 +11,7 @@ import lldbutil class HelloWatchLocationTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "hello_watchlocation") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py index 4b4bdad2720..e66cd0a0b1b 100644 --- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py +++ b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py @@ -13,7 +13,7 @@ class HelloWatchpointTestCase(TestBase): def getCategories (self): return ['basic_process'] - mydir = os.path.join("functionalities", "watchpoint", "hello_watchpoint") + mydir = TestBase.compute_mydir(__file__) @dsym_test def test_hello_watchpoint_with_dsym_using_watchpoint_set(self): diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py index 597a308d7e5..bc36d47d66c 100644 --- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py +++ b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py @@ -11,7 +11,7 @@ import lldbutil class WatchpointForMultipleThreadsTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "multiple_threads") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py index ab50971ad65..c35220d007e 100644 --- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py +++ b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py @@ -10,7 +10,7 @@ import lldbutil class WatchedVariableHitWhenInScopeTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "variable_out_of_scope") + mydir = TestBase.compute_mydir(__file__) # # This test depends on not tracking watchpoint expression hits if we have diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py index 460cf86bff7..f0ec916a8c3 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py @@ -10,7 +10,7 @@ import lldbutil class WatchpointCommandsTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_commands") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py index d39f9d4727c..b00a338d3ec 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py @@ -10,7 +10,7 @@ import lldbutil class WatchpointLLDBCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_commands", "command") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py index e56d060a017..cfd958109b6 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py @@ -10,7 +10,7 @@ import lldbutil class WatchpointPythonCommandTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_commands", "command") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py index 959b417dd22..b3f6fcf464a 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py @@ -10,7 +10,7 @@ import lldbutil class WatchpointConditionCmdTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_commands", "condition") + mydir = TestBase.compute_mydir(__file__) def setUp(self): # Call super's setUp(). diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py index ccc35532e45..094aa5e9e74 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py @@ -8,7 +8,7 @@ from lldbtest import * class TestWatchpointEvents (TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_events") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @python_api_test diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py index 5f9199fbbaf..02178c7b270 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py @@ -10,7 +10,7 @@ import lldbutil class WatchLocationUsingWatchpointSetTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_set_command") + mydir = TestBase.compute_mydir(__file__) @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py index 6a24589804f..cf385ae7231 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py @@ -10,7 +10,7 @@ import lldbutil class WatchpointSetErrorTestCase(TestBase): - mydir = os.path.join("functionalities", "watchpoint", "watchpoint_set_command") + mydir = TestBase.compute_mydir(__file__) @expectedFailureFreeBSD('llvm.org/pr16706') # Watchpoints not yet on FreeBSD def test_error_cases_with_watchpoint_set(self): |
