From 045fde58d13132959711d3a0c27a6bfa0bf9564d Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 18 Jul 2014 01:02:02 +0000 Subject: 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 --- lldb/test/functionalities/command_regex/TestCommandRegex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lldb/test/functionalities/command_regex/TestCommandRegex.py') diff --git a/lldb/test/functionalities/command_regex/TestCommandRegex.py b/lldb/test/functionalities/command_regex/TestCommandRegex.py index 5e9950f98a9..c0bfb38a906 100644 --- a/lldb/test/functionalities/command_regex/TestCommandRegex.py +++ b/lldb/test/functionalities/command_regex/TestCommandRegex.py @@ -5,7 +5,6 @@ Test lldb 'commands regex' command which allows the user to create a regular exp import os import unittest2 import lldb -import pexpect from lldbtest import * class CommandRegexTestCase(TestBase): @@ -14,6 +13,7 @@ class CommandRegexTestCase(TestBase): def test_command_regex(self): """Test a simple scenario of 'command regex' invocation and subsequent use.""" + import pexpect prompt = "(lldb) " regex_prompt = "Enter one of more sed substitution commands in the form: 's///'.\r\nTerminate the substitution list with an empty line.\r\n" regex_prompt1 = "\r\n" -- cgit v1.2.3