From 44bc44b49f3657196c274db0cea012e7a3359400 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 4 Sep 2015 15:24:11 +0000 Subject: [PATCH] rebase of the patch --- ...isable-display-PASS-UNSUPPORTED-XFAIL.diff | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff index 485c5e07..5b5d2b1d 100644 --- a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff +++ b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff @@ -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.7~svn238736/lldb/test/dotest.py -@@ -1671,8 +1671,8 @@ for ia in range(len(archs) if iterArchs - def addSuccess(self, test): - global parsable - super(LLDBTestResult, self).addSuccess(test) -- if parsable: -- self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) -+# if parsable: -+# self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) +--- llvm-toolchain-snapshot_3.8~svn246854.orig/lldb/test/dotest.py ++++ llvm-toolchain-snapshot_3.8~svn246854/lldb/test/dotest.py +@@ -1713,8 +1713,8 @@ if __name__ == "__main__": + def addSuccess(self, test): + global parsable + super(LLDBTestResult, self).addSuccess(test) +- if parsable: +- self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) ++# if parsable: ++# self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) - def addError(self, test, err): - global sdir_has_content -@@ -1712,8 +1712,8 @@ for ia in range(len(archs) if iterArchs - method = getattr(test, "markExpectedFailure", None) - if method: - method(err, bugnumber) -- if parsable: -- self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) -+# if parsable: -+# self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) + def addError(self, test, err): + global sdir_has_content +@@ -1765,8 +1765,8 @@ if __name__ == "__main__": + method = getattr(test, "markExpectedFailure", None) + if method: + method(err, bugnumber) +- if parsable: +- self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) ++# if parsable: ++# self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test))) - def addSkip(self, test, reason): - global sdir_has_content -@@ -1723,8 +1723,8 @@ for ia in range(len(archs) if iterArchs - method = getattr(test, "markSkippedTest", None) - if method: - method() -- if parsable: -- self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) -+# if parsable: -+# self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) + def addSkip(self, test, reason): + global sdir_has_content +@@ -1776,8 +1776,8 @@ if __name__ == "__main__": + method = getattr(test, "markSkippedTest", None) + if method: + method() +- if parsable: +- self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) ++# if parsable: ++# self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason)) - def addUnexpectedSuccess(self, test, bugnumber): - global sdir_has_content -Index: llvm-toolchain-snapshot_3.7~svn238736/lldb/test/unittest2/runner.py + def addUnexpectedSuccess(self, test, bugnumber): + global sdir_has_content +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.7~svn238736/lldb/test/unittest2/runner.py +--- llvm-toolchain-snapshot_3.8~svn246854.orig/lldb/test/unittest2/runner.py ++++ llvm-toolchain-snapshot_3.8~svn246854/lldb/test/unittest2/runner.py @@ -171,9 +171,9 @@ class TextTestRunner(unittest.TextTestRu if hasattr(result, 'separator2'): self.stream.writeln(result.separator2)