Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 12 Aug 2014 17:22:57 -0500
changeset 22132 a076a196641b
parent 22131 8768342af0cd (current diff)
parent 22122 a6eddeda93f3 (diff)
child 22133 d732ff677b96
merge with stable
tests/run-tests.py file | annotate | diff | comparison | revisions
tests/test-run-tests.t file | annotate | diff | comparison | revisions 
--- 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:]))
--- 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
mercurial