# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305754245 -7200
# Node ID eb6ebe425bf668e7657f4a5f6c06b620ef3cf849
# Parent  d93ca857e4bb1a678c754d4fb922e98acc69e46c# Parent  0af8a73dfe14be3666cfb5e8c23646b6ba3d5bd6
Merge with stable

diff -r d93ca857e4bb -r eb6ebe425bf6 tests/run-tests.py
--- a/tests/run-tests.py	Wed May 18 00:44:15 2011 +0200
+++ b/tests/run-tests.py	Wed May 18 23:30:45 2011 +0200
@@ -182,7 +182,7 @@
                 os.access(options.with_hg, os.X_OK)):
             parser.error('--with-hg must specify an executable hg script')
         if not os.path.basename(options.with_hg) == 'hg':
-            sys.stderr.write('warning: --with-hg should specify an hg script')
+            sys.stderr.write('warning: --with-hg should specify an hg script\n')
     if options.local:
         testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
         hgbin = os.path.join(os.path.dirname(testdir), 'hg')
@@ -241,7 +241,7 @@
         options.timeout = 0
     if options.timeout and not hasattr(subprocess.Popen, 'terminate'):
         sys.stderr.write('warning: timeout is not supported on this '
-                         'platform and will be ignored')
+                         'platform and will be ignored\n')
         options.timeout = 0
     if options.py3k_warnings:
         if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):