rebase of the patch

This commit is contained in:
Sylvestre Ledru 2015-09-04 15:24:11 +00:00
parent 32c940e7a8
commit 44bc44b49f

View File

@ -1,44 +1,44 @@
Index: llvm-toolchain-snapshot_3.7~svn238736/lldb/test/dotest.py Index: llvm-toolchain-snapshot_3.8~svn246854/lldb/test/dotest.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn238736.orig/lldb/test/dotest.py --- llvm-toolchain-snapshot_3.8~svn246854.orig/lldb/test/dotest.py
+++ llvm-toolchain-snapshot_3.7~svn238736/lldb/test/dotest.py +++ llvm-toolchain-snapshot_3.8~svn246854/lldb/test/dotest.py
@@ -1671,8 +1671,8 @@ for ia in range(len(archs) if iterArchs @@ -1713,8 +1713,8 @@ if __name__ == "__main__":
def addSuccess(self, test): def addSuccess(self, test):
global parsable global parsable
super(LLDBTestResult, self).addSuccess(test) super(LLDBTestResult, self).addSuccess(test)
- if parsable: - if parsable:
- self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) - self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+# if parsable: +# if parsable:
+# self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) +# self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
def addError(self, test, err): def addError(self, test, err):
global sdir_has_content global sdir_has_content
@@ -1712,8 +1712,8 @@ for ia in range(len(archs) if iterArchs @@ -1765,8 +1765,8 @@ if __name__ == "__main__":
method = getattr(test, "markExpectedFailure", None) method = getattr(test, "markExpectedFailure", None)
if method: if method:
method(err, bugnumber) method(err, bugnumber)
- if parsable: - if parsable:
- self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) - self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+# if parsable: +# if parsable:
+# self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) +# self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
def addSkip(self, test, reason): def addSkip(self, test, reason):
global sdir_has_content global sdir_has_content
@@ -1723,8 +1723,8 @@ for ia in range(len(archs) if iterArchs @@ -1776,8 +1776,8 @@ if __name__ == "__main__":
method = getattr(test, "markSkippedTest", None) method = getattr(test, "markSkippedTest", None)
if method: if method:
method() method()
- if parsable: - if parsable:
- self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) - self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason))
+# if parsable: +# if parsable:
+# self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) +# self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason))
def addUnexpectedSuccess(self, test, bugnumber): def addUnexpectedSuccess(self, test, bugnumber):
global sdir_has_content global sdir_has_content
Index: llvm-toolchain-snapshot_3.7~svn238736/lldb/test/unittest2/runner.py Index: llvm-toolchain-snapshot_3.8~svn246854/lldb/test/unittest2/runner.py
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.7~svn238736.orig/lldb/test/unittest2/runner.py --- llvm-toolchain-snapshot_3.8~svn246854.orig/lldb/test/unittest2/runner.py
+++ llvm-toolchain-snapshot_3.7~svn238736/lldb/test/unittest2/runner.py +++ llvm-toolchain-snapshot_3.8~svn246854/lldb/test/unittest2/runner.py
@@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu @@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu
if hasattr(result, 'separator2'): if hasattr(result, 'separator2'):
self.stream.writeln(result.separator2) self.stream.writeln(result.separator2)