rebase of the patch

This commit is contained in:
Sylvestre Ledru 2015-10-23 07:02:03 +00:00
parent 1039c70ee0
commit 45ce8cc44e

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_3.8~svn248088/lldb/test/dotest.py
Index: llvm-toolchain-snapshot_3.8~svn251098/lldb/test/dotest.py
===================================================================
--- llvm-toolchain-snapshot_3.8~svn248088.orig/lldb/test/dotest.py
+++ llvm-toolchain-snapshot_3.8~svn248088/lldb/test/dotest.py
@@ -1898,8 +1898,8 @@ if __name__ == "__main__":
--- llvm-toolchain-snapshot_3.8~svn251098.orig/lldb/test/dotest.py
+++ llvm-toolchain-snapshot_3.8~svn251098/lldb/test/dotest.py
@@ -1913,8 +1913,8 @@ if __name__ == "__main__":
def addSuccess(self, test):
global parsable
super(LLDBTestResult, self).addSuccess(test)
@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_3.8~svn248088/lldb/test/dotest.py
if self.results_formatter:
self.results_formatter.handle_event(
EventBuilder.event_for_success(test))
@@ -1964,8 +1964,8 @@ if __name__ == "__main__":
@@ -1979,8 +1979,8 @@ if __name__ == "__main__":
method = getattr(test, "markExpectedFailure", None)
if method:
method(err, bugnumber)
@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_3.8~svn248088/lldb/test/dotest.py
if self.results_formatter:
self.results_formatter.handle_event(
EventBuilder.event_for_expected_failure(
@@ -1979,8 +1979,8 @@ if __name__ == "__main__":
@@ -1994,8 +1994,8 @@ if __name__ == "__main__":
method = getattr(test, "markSkippedTest", None)
if method:
method()
@ -35,10 +35,10 @@ Index: llvm-toolchain-snapshot_3.8~svn248088/lldb/test/dotest.py
if self.results_formatter:
self.results_formatter.handle_event(
EventBuilder.event_for_skip(test, reason))
Index: llvm-toolchain-snapshot_3.8~svn248088/lldb/test/unittest2/runner.py
Index: llvm-toolchain-snapshot_3.8~svn251098/lldb/third_party/Python/module/unittest2/unittest2/runner.py
===================================================================
--- llvm-toolchain-snapshot_3.8~svn248088.orig/lldb/test/unittest2/runner.py
+++ llvm-toolchain-snapshot_3.8~svn248088/lldb/test/unittest2/runner.py
--- llvm-toolchain-snapshot_3.8~svn251098.orig/lldb/third_party/Python/module/unittest2/unittest2/runner.py
+++ llvm-toolchain-snapshot_3.8~svn251098/lldb/third_party/Python/module/unittest2/unittest2/runner.py
@@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu
if hasattr(result, 'separator2'):
self.stream.writeln(result.separator2)