comparison tests/run-tests.py @ 22132:a076a196641b

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 12 Aug 2014 17:22:57 -0500
parents 3b5cf39ffcc4 a6eddeda93f3
children 3ddfb9b3fdc6
comparison
equal deleted inserted replaced
22131:8768342af0cd 22132:a076a196641b
1788 if not self.options.verbose: 1788 if not self.options.verbose:
1789 os.remove(installerrs) 1789 os.remove(installerrs)
1790 else: 1790 else:
1791 f = open(installerrs, 'rb') 1791 f = open(installerrs, 'rb')
1792 for line in f: 1792 for line in f:
1793 print line, 1793 print line
1794 f.close() 1794 f.close()
1795 sys.exit(1) 1795 sys.exit(1)
1796 os.chdir(self._testdir) 1796 os.chdir(self._testdir)
1797 1797
1798 self._usecorrectpython() 1798 self._usecorrectpython()
1907 else: 1907 else:
1908 print "WARNING: Did not find prerequisite tool: %s " % p 1908 print "WARNING: Did not find prerequisite tool: %s " % p
1909 1909
1910 if __name__ == '__main__': 1910 if __name__ == '__main__':
1911 runner = TestRunner() 1911 runner = TestRunner()
1912
1913 try:
1914 import msvcrt
1915 msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
1916 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
1917 msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
1918 except ImportError:
1919 pass
1920
1912 sys.exit(runner.run(sys.argv[1:])) 1921 sys.exit(runner.run(sys.argv[1:]))