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
diff --git a/lldb/test/benchmarks/disassembly/TestDisassembly.py b/lldb/test/benchmarks/disassembly/TestDisassembly.py
index cff68b7..a2a54bd 100644
--- a/lldb/test/benchmarks/disassembly/TestDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestDisassembly.py
@@ -12,7 +12,7 @@
class DisassembleDriverMainLoop(BenchBase):
- mydir = os.path.join("benchmarks", "disassembly")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
"""
diff --git a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
index 0085a14..b31c244 100644
--- a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
@@ -10,7 +10,7 @@
class AttachThenDisassemblyBench(BenchBase):
- mydir = os.path.join("benchmarks", "disassembly")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
index 6e6875c..6c6dd98 100644
--- a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
+++ b/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
@@ -8,7 +8,7 @@
class XCode41Vs42GDBDisassembly(BenchBase):
- mydir = os.path.join("benchmarks", "disassembly")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/expression/TestExpressionCmd.py b/lldb/test/benchmarks/expression/TestExpressionCmd.py
index ca24739..5f71004 100644
--- a/lldb/test/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/test/benchmarks/expression/TestExpressionCmd.py
@@ -8,7 +8,7 @@
class ExpressionEvaluationCase(BenchBase):
- mydir = os.path.join("benchmarks", "expression")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/benchmarks/expression/TestRepeatedExprs.py
index 91a3335..1e7338f 100644
--- a/lldb/test/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/test/benchmarks/expression/TestRepeatedExprs.py
@@ -8,7 +8,7 @@
class RepeatedExprsCase(BenchBase):
- mydir = os.path.join("benchmarks", "expression")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
index 03cc09d..e3acedd 100644
--- a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -8,7 +8,7 @@
class FrameVariableResponseBench(BenchBase):
- mydir = os.path.join("benchmarks", "frame_variable")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/startup/TestStartupDelays.py b/lldb/test/benchmarks/startup/TestStartupDelays.py
index 2c3cad5..b9bf90b 100644
--- a/lldb/test/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/test/benchmarks/startup/TestStartupDelays.py
@@ -8,7 +8,7 @@
class StartupDelaysBench(BenchBase):
- mydir = os.path.join("benchmarks", "startup")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
index dca6e95..da3ff22 100644
--- a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
+++ b/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
@@ -8,7 +8,7 @@
class RunHooksThenSteppingsBench(BenchBase):
- mydir = os.path.join("benchmarks", "stepping")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
index 780e253..a62491c 100644
--- a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
@@ -8,7 +8,7 @@
class SteppingSpeedBench(BenchBase):
- mydir = os.path.join("benchmarks", "stepping")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)
diff --git a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index d923f13..d9d3f42 100644
--- a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -8,7 +8,7 @@
class CompileRunToBreakpointBench(BenchBase):
- mydir = os.path.join("benchmarks", "turnaround")
+ mydir = TestBase.compute_mydir(__file__)
def setUp(self):
BenchBase.setUp(self)