diff --git a/debian/changelog b/debian/changelog index 3948aa24..662116a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:3.5~svn197156-1~exp1) UNRELEASED; urgency=low + + * New snapshot release + * Disable much of the display of the lldb display + + -- Sylvestre Ledru Thu, 12 Dec 2013 16:30:45 +0100 + llvm-toolchain-snapshot (1:3.5~svn195337-1) unstable; urgency=low * Sync from 3.4~+rc2-1 diff --git a/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff new file mode 100644 index 00000000..8b3756da --- /dev/null +++ b/debian/patches/disable-display-PASS-UNSUPPORTED-XFAIL.diff @@ -0,0 +1,63 @@ +Index: llvm-toolchain-snapshot_3.5~svn197156/lldb/test/dotest.py +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn197156.orig/lldb/test/dotest.py 2013-12-13 12:57:06.164107995 +0100 ++++ llvm-toolchain-snapshot_3.5~svn197156/lldb/test/dotest.py 2013-12-13 13:00:27.300114432 +0100 +@@ -675,7 +675,7 @@ + + if args.q: + noHeaders = True +- parsable = False ++ parsable = True + + if args.P and not args.v: + progress_bar = True +@@ -1609,8 +1609,8 @@ + 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 +@@ -1650,8 +1650,8 @@ + 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 +@@ -1661,8 +1661,8 @@ + 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.5~svn197156/lldb/test/unittest2/runner.py +=================================================================== +--- llvm-toolchain-snapshot_3.5~svn197156.orig/lldb/test/unittest2/runner.py 2013-09-25 22:47:51.000000000 +0200 ++++ llvm-toolchain-snapshot_3.5~svn197156/lldb/test/unittest2/runner.py 2013-12-13 13:49:34.540208744 +0100 +@@ -171,9 +171,9 @@ + if hasattr(result, 'separator2'): + self.stream.writeln(result.separator2) + run = result.testsRun +- self.stream.writeln("Ran %d test%s in %.3fs" % +- (run, run != 1 and "s" or "", timeTaken)) +- self.stream.writeln() ++# self.stream.writeln("Ran %d test%s in %.3fs" % ++# (run, run != 1 and "s" or "", timeTaken)) ++# self.stream.writeln() + + expectedFails = unexpectedSuccesses = skipped = 0 + try: diff --git a/debian/patches/series b/debian/patches/series index cb11fd54..daf28aa6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,5 +31,5 @@ include-target.diff debian-mips64-n32-multiarch.diff force-gcc-header-obj.diff do-not-fail-on-unexpected-pass.diff - silent-more-tests.diff +disable-display-PASS-UNSUPPORTED-XFAIL.diff