Mercurial > hg-stable
changeset 22132:a076a196641b
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 12 Aug 2014 17:22:57 -0500 |
| parents | 8768342af0cd (current diff) a6eddeda93f3 (diff) |
| children | d732ff677b96 |
| files | tests/run-tests.py tests/test-run-tests.t |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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