Make lldb -P work on Windows

[zturner]

Summary

This fixes a few issues related to running the test suite on Windows. Most notably, it makes lldb -P return the expected python path so this can be used by the test script.

[tfiala]

Checking on this now.

[zturner]

Closed by commit rL213410 (authored by @zturner).

lldb/trunk/source/Host/common/Host.cpp

case ePathTypePythonDir:
             static ConstString g_lldb_python_dir;
             if (!g_lldb_python_dir)
             {
                 FileSpec lldb_file_spec;
                 if (GetLLDBPath (ePathTypeLLDBShlibDir, lldb_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__)
                     char *framework_pos = ::strstr (raw_path, "LLDB.framework");
                     if (framework_pos)
                     {
                         framework_pos += strlen("LLDB.framework");
                         ::strncpy (framework_pos, "/Resources/Python", PATH_MAX - (framework_pos - raw_path));
                     } 
                     else 
                     {
 #endif
                         llvm::SmallString<256> python_version_dir;
                         llvm::raw_svector_ostream os(python_version_dir);
                         os << "/python" << PY_MAJOR_VERSION << '.' << PY_MINOR_VERSION << "/site-packages";
                         os.flush();
 
                         // We may get our string truncated. Should we protect
                         // this with an assert?
 
                         ::strncat(raw_path, python_version_dir.c_str(),
                                   sizeof(raw_path) - strlen(raw_path) - 1);
-
+#endif
 #if defined (__APPLE__)
                     }
 #endif
                     FileSpec::Resolve (raw_path, resolved_path, sizeof(resolved_path));
                     g_lldb_python_dir.SetCString(resolved_path);
                 }
                 
                 if (log)

lldb/trunk/source/Host/windows/Host.cpp

 {
     return NULL;
 }
 
 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;
 }
 
 void *
 Host::DynamicLibraryOpen(const FileSpec &file_spec, uint32_t options, Error &error)
 {
     error.SetErrorString("not implemented");
     return NULL;
(
     Host::MonitorChildProcessCallback callback,
     void *callback_baton,
     lldb::pid_t pid,
     bool monitor_signals
 )
 {
     return LLDB_INVALID_HOST_THREAD;
 }
 No newline at end of file

lldb/trunk/test/dotest.py

if lldbFrameworkPath:
             sys.exit(-1)
     else:
         # The '-i' option is used to skip looking for lldb.py in the build tree.
         if ignore:
             return
         
         # 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, '..', '..')
         
         if not lldbPath: 
             dbgPath  = os.path.join(base, *(xcode3_build_dir + dbg + python_resource_dir))
             dbgPath2 = os.path.join(base, *(xcode4_build_dir + dbg + python_resource_dir))
             dbcPath  = os.path.join(base, *(xcode3_build_dir + dbc + python_resource_dir))