Remove special case logic for finding 3rd party libs

llvm-svn: 251047

diff --git a/lldb/lldb_shared_base.py b/lldb/lldb_shared_base.py
index 6612414..466de5d 100644 (file)
--- a/lldb/lldb_shared_base.py
+++ b/lldb/lldb_shared_base.py
@@ -10,6 +10,6 @@ def add_third_party_module_dirs(lldb_root):
     module_dirs = os.listdir(third_party_modules_dir)
     for module_dir in module_dirs:
         module_dir = os.path.join(third_party_modules_dir, module_dir)
-        sys.path.append(module_dir)
+        sys.path.insert(0, module_dir)
 lldb_root = os.path.dirname(inspect.getfile(inspect.currentframe()))
 add_third_party_module_dirs(lldb_root)

diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 17b359a..883379d 100755 (executable)
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -1116,14 +1116,9 @@ def setupSysPath():
     os.environ["LLDB_SRC"] = os.path.join(scriptPath, os.pardir)
 
     pluginPath = os.path.join(scriptPath, 'plugins')
-    pexpectPath = os.path.join(scriptPath, 'pexpect-2.4')
     toolsLLDBMIPath = os.path.join(scriptPath, 'tools', 'lldb-mi')
     toolsLLDBServerPath = os.path.join(scriptPath, 'tools', 'lldb-server')
 
-    # Put embedded pexpect at front of the load path so we ensure we
-    # use that version.
-    sys.path.insert(0, pexpectPath)
-
     # Insert script dir, plugin dir, lldb-mi dir and lldb-server dir to the sys.path.
     sys.path.insert(0, scriptPath)
     sys.path.insert(0, pluginPath)