Tighten up sys.path, and use absolute imports everywhere.

For convenience, we had added the folder that dotest.py was in
to sys.path, so that we could easily write things like
`import lldbutil` from anywhere and any test.  This introduces
a subtle problem when using Python's package system, because when
unittest2 imports a particular test suite, the test suite is detached
from the package.  Thus, writing "import lldbutil" from dotest imports
it as part of the package, and writing the same line from a test
does a fresh import since the importing module was not part of
the same package.

The real way to fix this is to use absolute imports everywhere.  Instead
of writing "import lldbutil", we need to write "import
lldbsuite.test.util".  This patch fixes up that and all other similar
cases, and additionally removes the script directory from sys.path
to ensure that this can't happen again.

llvm-svn: 251886

11 files changed, 12 insertions, 12 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
index a03eb4239ac..c652a556236 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
@@ -8,8 +8,8 @@ import use_lldb_suite
 
 import os, time
 import lldb
-from lldbbench import *
-import lldbutil
+from lldbsuite.test.lldbbench import *
+import lldbsuite.test.lldbutil as lldbutil
 
 class TestBenchmarkContinue(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
index 69d645a52e0..37d0e7336a4 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 def is_exe(fpath):
     """Returns true if fpath is an executable."""
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
index 1e1c1d48fd9..56eba48e181 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
@@ -8,7 +8,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class AttachThenDisassemblyBench(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
index 4db2d08199b..964a868da5a 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class XCode41Vs42GDBDisassembly(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
index 9540c0ce68d..dcd5b2ae065 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class ExpressionEvaluationCase(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
index 78111051e2d..bb4219dc51e 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class RepeatedExprsCase(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
index baad1c4464a..1cbd330e4bc 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class FrameVariableResponseBench(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
index f95225ba92f..9808dc83373 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class StartupDelaysBench(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
index cb85dd19948..e8884930e08 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class RunHooksThenSteppingsBench(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
index c1b6e716414..64bf9e924c9 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class SteppingSpeedBench(BenchBase):
 
diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index 0c3d34f1507..0a6d2c4eddf 100644
--- a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -6,7 +6,7 @@ import use_lldb_suite
 
 import os, sys
 import lldb
-from lldbbench import *
+from lldbsuite.test.lldbbench import *
 
 class CompileRunToBreakpointBench(BenchBase):