Merging the iohandler branch back into main.

The many many benefits include:
1 - Input/Output/Error streams are now handled as real streams not a push style input
2 - auto completion in python embedded interpreter
3 - multi-line input for "script" and "expression" commands now allow you to edit previous/next lines using up and down arrow keys and this makes multi-line input actually a viable thing to use
4 - it is now possible to use curses to drive LLDB (please try the "gui" command)

We will need to deal with and fix any buildbot failures and tests and arise now that input/output and error are correctly hooked up in all cases.

llvm-svn: 200263

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
index e940261f4d2..c3ee8ffbeed 100644
--- a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
@@ -22,9 +22,9 @@ class Rdar12586188TestCase(TestBase):
         """Check that we handle an ImportError in a special way when command script importing files."""
 
         self.expect("command script import ./fail12586188.py --allow-reload",
-                error=True, substrs = ['error: module importing failed: I do not want to be imported'])
+                error=True, substrs = ['raise ImportError("I do not want to be imported")'])
         self.expect("command script import ./fail212586188.py --allow-reload",
-                error=True, substrs = ['error: module importing failed: Python error raised while importing module: I do not want to be imported'])
+                error=True, substrs = ['raise ValueError("I do not want to be imported")'])
 
 if __name__ == '__main__':
     import atexit