From 19474e1801ca3eafe9a07d0cf49ee20a9104b434 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 3 Nov 2015 19:20:39 +0000 Subject: Remove `use_lldb_suite` from the package, and don't import it anymore. This module was originally intended to be imported by top-level scripts to be able to find the LLDB packages and third party libraries. Packages themselves shouldn't need to import it, because by the time it gets into the package, the top-level script should have already done this. Indeed, it was just adding the same values to sys.path multiple times, so this patch is essentially no functional change. To make sure it doesn't get re-introduced, we also delete the `use_lldb_suite` module from `lldbsuite/test`, although the original copy still remains in `lldb/test` llvm-svn: 251963 --- .../Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py | 2 +- .../Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py | 2 +- .../test/benchmarks/disassembly/TestDoAttachThenDisassembly.py | 2 +- .../test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py | 2 +- .../Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py | 2 +- .../Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py | 2 +- .../test/benchmarks/frame_variable/TestFrameVariableResponse.py | 2 +- .../Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py | 2 +- .../lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py | 2 +- .../Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py | 2 +- .../test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/benchmarks') diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py index c652a556236..25ca13a3bfd 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py @@ -4,7 +4,7 @@ Test lldb data formatter subsystem. from __future__ import print_function -import use_lldb_suite + import os, time import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py index 37d0e7336a4..f9c1940bc25 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py index 56eba48e181..a7c17bcd346 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py @@ -4,7 +4,7 @@ inferior and traverses the stack for thread0 to arrive at frame with function from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py index 964a868da5a..2432f335b19 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py index dcd5b2ae065..eca768afa2f 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py index bb4219dc51e..fb629ff27bb 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb 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 1cbd330e4bc..9e758bfde53 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py index 9808dc83373..c815c735588 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py index e8884930e08..c26f4256502 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py index 64bf9e924c9..ef3179fa43a 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb diff --git a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py index 0a6d2c4eddf..757e9b9704a 100644 --- a/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py +++ b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py @@ -2,7 +2,7 @@ from __future__ import print_function -import use_lldb_suite + import os, sys import lldb -- cgit v1.2.3