Fixes a number of issue related to test portability on Windows.

99% of this CL is simply moving calls to "import pexpect" to a more
narrow scope - i.e. the function that actually runs a particular
test.  This way the test suite can run on Windows, which doesn't have
pexpect, and the individual tests that use pexpect can be disabled on
a platform-specific basis.

Additionally, this CL fixes a few other cases of non-portability.
Notably, using "ps" to get the command line, and os.uname() to
determine the architecture don't work on Windows.  Finally, this
also adds a stubbed out builder_win32 module.

The full test suite runs correctly on Windows after this CL, although
there is still some work remaining on the C++ side to fix one-shot
script commands from LLDB (e.g. script print "foo"), which currently
deadlock.

Reviewed by: Todd Fiala

Differential Revision: http://reviews.llvm.org/D4573

llvm-svn: 213343

1 files changed, 1 insertions, 1 deletions

diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
index 7fd553aa3ef..0627b020229 100644
--- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
+++ b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
@@ -5,7 +5,6 @@ Test that lldb stop-hook works for multiple threads.
 import os, time
 import unittest2
 import lldb
-import pexpect
 from lldbtest import *
 
 class StopHookForMultipleThreadsTestCase(TestBase):
@@ -42,6 +41,7 @@ class StopHookForMultipleThreadsTestCase(TestBase):
 
     def stop_hook_multiple_threads(self):
         """Test that lldb stop-hook works for multiple threads."""
+        import pexpect
         exe = os.path.join(os.getcwd(), self.exe_name)
         prompt = "(lldb) "