summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/functionalities/command_script
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2015-11-03 19:20:39 +0000
committerZachary Turner <zturner@google.com>2015-11-03 19:20:39 +0000
commit19474e1801ca3eafe9a07d0cf49ee20a9104b434 (patch)
tree59933a9f911fbb0b962f475dff8b26bcb2d637fb /lldb/packages/Python/lldbsuite/test/functionalities/command_script
parent22892687f7954142c33242e83d505c20d7fba575 (diff)
downloadbcm5719-llvm-19474e1801ca3eafe9a07d0cf49ee20a9104b434.tar.gz
bcm5719-llvm-19474e1801ca3eafe9a07d0cf49ee20a9104b434.zip
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
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/command_script')
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py2
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
index f8b6a92e43b..542ee7a1e5f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
@@ -4,7 +4,7 @@ Test lldb Python commands.
from __future__ import print_function
-import use_lldb_suite
+
import os, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
index 9650c25cda7..691045ae82e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
index 758e6c597b1..9800a08c06d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
@@ -2,7 +2,7 @@
from __future__ import print_function
-import use_lldb_suite
+
import os, sys, time
import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
index 8d8d7f1c53f..fb65305d205 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
@@ -1,4 +1,4 @@
-import use_lldb_suite
+
import six
def command(debugger, command, result, internal_dict):
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
index e74686ed619..60b31b89f6d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
@@ -1,4 +1,4 @@
-import use_lldb_suite
+
import six
def command(debugger, command, result, internal_dict):
OpenPOWER on IntegriCloud