diff options
| -rw-r--r-- | lldb/source/Host/common/Host.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Host/windows/Host.cpp | 14 | ||||
| -rwxr-xr-x | lldb/test/dotest.py | 10 |
3 files changed, 24 insertions, 6 deletions
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp index 79ae92ace4d..0006a61df0c 100644 --- a/lldb/source/Host/common/Host.cpp +++ b/lldb/source/Host/common/Host.cpp @@ -1152,6 +1152,10 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec) { char raw_path[PATH_MAX]; char resolved_path[PATH_MAX]; +#if defined(_WIN32) + lldb_file_spec.AppendPathComponent("../lib/site-packages"); + lldb_file_spec.GetPath(raw_path, sizeof(raw_path)); +#else lldb_file_spec.GetPath(raw_path, sizeof(raw_path)); #if defined (__APPLE__) @@ -1174,7 +1178,7 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec) ::strncat(raw_path, python_version_dir.c_str(), sizeof(raw_path) - strlen(raw_path) - 1); - +#endif #if defined (__APPLE__) } #endif diff --git a/lldb/source/Host/windows/Host.cpp b/lldb/source/Host/windows/Host.cpp index e2197caf024..9fa265200e4 100644 --- a/lldb/source/Host/windows/Host.cpp +++ b/lldb/source/Host/windows/Host.cpp @@ -247,6 +247,20 @@ FileSpec Host::GetModuleFileSpecForHostAddress (const void *host_addr) { FileSpec module_filespec; + + HMODULE hmodule = NULL; + if (!::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)host_addr, &hmodule)) + return module_filespec; + + std::vector<char> buffer(MAX_PATH); + DWORD chars_copied = 0; + do { + chars_copied = ::GetModuleFileName(hmodule, &buffer[0], buffer.size()); + if (chars_copied == buffer.size() && ::GetLastError() == ERROR_INSUFFICIENT_BUFFER) + buffer.resize(buffer.size() * 2); + } while (chars_copied >= buffer.size()); + + module_filespec.SetFile(&buffer[0], false); return module_filespec; } diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py index fa4cde6d72c..101fbfdf316 100755 --- a/lldb/test/dotest.py +++ b/lldb/test/dotest.py @@ -1004,17 +1004,17 @@ def setupSysPath(): # If our lldb supports the -P option, use it to find the python path: init_in_python_dir = 'lldb/__init__.py' - import pexpect lldb_dash_p_result = None if lldbHere: - lldb_dash_p_result = pexpect.run("%s -P"%(lldbHere)) + lldb_dash_p_result = subprocess.check_output([lldbHere, "-P"], stderr=subprocess.STDOUT) elif lldbExec: - lldb_dash_p_result = pexpect.run("%s -P"%(lldbExec)) + lldb_dash_p_result = subprocess.check_output([lldbExec, "-P"], stderr=subprocess.STDOUT) - if lldb_dash_p_result and not lldb_dash_p_result.startswith(("<", "lldb: invalid option:")): + if lldb_dash_p_result and not lldb_dash_p_result.startswith(("<", "lldb: invalid option:")) \ + and not lldb_dash_p_result.startswith("Traceback"): lines = lldb_dash_p_result.splitlines() - if len(lines) == 1 and os.path.isfile(os.path.join(lines[0], init_in_python_dir)): + if len(lines) >= 1 and os.path.isfile(os.path.join(lines[0], init_in_python_dir)): lldbPath = lines[0] if "freebsd" in sys.platform or "linux" in sys.platform: os.environ['LLDB_LIB_DIR'] = os.path.join(lldbPath, '..', '..') |
