# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1407882177 18000
# Node ID a076a196641b039349d03f08efcfe69d29f343f2
# Parent  8768342af0cd538fddd898c64fa6e504635070c9# Parent  a6eddeda93f38a64a278bf58178f726c07600e52
merge with stable

diff -r 8768342af0cd -r a076a196641b tests/run-tests.py
--- a/tests/run-tests.py	Wed Jun 25 17:31:53 2014 +0100
+++ b/tests/run-tests.py	Tue Aug 12 17:22:57 2014 -0500
@@ -1790,7 +1790,7 @@
         else:
             f = open(installerrs, 'rb')
             for line in f:
-                print line,
+                print line
             f.close()
             sys.exit(1)
         os.chdir(self._testdir)
@@ -1909,4 +1909,13 @@
 
 if __name__ == '__main__':
     runner = TestRunner()
+
+    try:
+        import msvcrt
+        msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
+        msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+        msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
+    except ImportError:
+        pass
+
     sys.exit(runner.run(sys.argv[1:]))
diff -r 8768342af0cd -r a076a196641b tests/test-run-tests.t
--- a/tests/test-run-tests.t	Wed Jun 25 17:31:53 2014 +0100
+++ b/tests/test-run-tests.t	Tue Aug 12 17:22:57 2014 -0500
@@ -159,7 +159,7 @@
 Running In Debug Mode
 ======================
 
-  $ $TESTDIR/run-tests.py --with-hg=`which hg` --debug
+  $ $TESTDIR/run-tests.py --with-hg=`which hg` --debug | grep -v pwd
   + echo SALT* 0 0 (glob)
   SALT* 0 0 (glob)
   + echo babar