# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1392155456 -3600
# Node ID 7fb45860e26779024c0679d9a09ce7cf332f85ff
# Parent  89668f3ba3bc308526d4c50051e3c548629c7819# Parent  953d562c3ebf93640f298fc4540568d7b0b785ad
Merge with stable

diff -r 89668f3ba3bc -r 7fb45860e267 tests/run-tests.py
--- a/tests/run-tests.py	Mon Feb 10 14:08:42 2014 +0100
+++ b/tests/run-tests.py	Tue Feb 11 22:50:56 2014 +0100
@@ -800,7 +800,7 @@
                     r = False
                 elif r == '-glob':
                     log('\ninfo, unnecessary glob in %s (after line %d):'
-                        ' %s (glob)\n' % (test, pos, el[-1]))
+                        ' %s (glob)\n' % (test, pos, el[:-1]))
                     r = True # pass on unnecessary glob
                 else:
                     log('\ninfo, unknown linematch result: %r\n' % r)