equal
deleted
inserted
replaced
96 |
96 |
97 defaults = { |
97 defaults = { |
98 'jobs': ('HGTEST_JOBS', 1), |
98 'jobs': ('HGTEST_JOBS', 1), |
99 'timeout': ('HGTEST_TIMEOUT', 180), |
99 'timeout': ('HGTEST_TIMEOUT', 180), |
100 'port': ('HGTEST_PORT', 20059), |
100 'port': ('HGTEST_PORT', 20059), |
101 'shell': ('HGTEST_SHELL', '/bin/sh'), |
101 'shell': ('HGTEST_SHELL', 'sh'), |
102 } |
102 } |
103 |
103 |
104 def parselistfiles(files, listtype, warn=True): |
104 def parselistfiles(files, listtype, warn=True): |
105 entries = dict() |
105 entries = dict() |
106 for filename in files: |
106 for filename in files: |
198 # jython is always pure |
198 # jython is always pure |
199 if 'java' in sys.platform or '__pypy__' in sys.modules: |
199 if 'java' in sys.platform or '__pypy__' in sys.modules: |
200 options.pure = True |
200 options.pure = True |
201 |
201 |
202 if options.with_hg: |
202 if options.with_hg: |
|
203 options.with_hg = os.path.expanduser(options.with_hg) |
203 if not (os.path.isfile(options.with_hg) and |
204 if not (os.path.isfile(options.with_hg) and |
204 os.access(options.with_hg, os.X_OK)): |
205 os.access(options.with_hg, os.X_OK)): |
205 parser.error('--with-hg must specify an executable hg script') |
206 parser.error('--with-hg must specify an executable hg script') |
206 if not os.path.basename(options.with_hg) == 'hg': |
207 if not os.path.basename(options.with_hg) == 'hg': |
207 sys.stderr.write('warning: --with-hg should specify an hg script\n') |
208 sys.stderr.write('warning: --with-hg should specify an hg script\n') |
596 f = open(test) |
597 f = open(test) |
597 t = f.readlines() |
598 t = f.readlines() |
598 f.close() |
599 f.close() |
599 |
600 |
600 script = [] |
601 script = [] |
|
602 if options.debug: |
|
603 script.append('set -x\n') |
601 if os.getenv('MSYSTEM'): |
604 if os.getenv('MSYSTEM'): |
602 script.append('alias pwd="pwd -W"\n') |
605 script.append('alias pwd="pwd -W"\n') |
603 for n, l in enumerate(t): |
606 for n, l in enumerate(t): |
604 if not l.endswith('\n'): |
607 if not l.endswith('\n'): |
605 l += '\n' |
608 l += '\n' |