Show More
@@ -46,6 +46,13 b' defaults = {' | |||||
46 | 'port': ('HGTEST_PORT', 20059), |
|
46 | 'port': ('HGTEST_PORT', 20059), | |
47 | } |
|
47 | } | |
48 |
|
48 | |||
|
49 | # globals set by parse_args() (ugh) | |||
|
50 | verbose = False | |||
|
51 | nodiff = False | |||
|
52 | coverage = False | |||
|
53 | python = None | |||
|
54 | ||||
|
55 | def parse_args(): | |||
49 | parser = optparse.OptionParser("%prog [options] [tests]") |
|
56 | parser = optparse.OptionParser("%prog [options] [tests]") | |
50 | parser.add_option("-C", "--annotate", action="store_true", |
|
57 | parser.add_option("-C", "--annotate", action="store_true", | |
51 | help="output files annotated with coverage") |
|
58 | help="output files annotated with coverage") | |
@@ -90,6 +97,8 b' for option, default in defaults.items():' | |||||
90 | defaults[option] = int(os.environ.get(*default)) |
|
97 | defaults[option] = int(os.environ.get(*default)) | |
91 | parser.set_defaults(**defaults) |
|
98 | parser.set_defaults(**defaults) | |
92 | (options, args) = parser.parse_args() |
|
99 | (options, args) = parser.parse_args() | |
|
100 | ||||
|
101 | global verbose, nodiff, coverage, python | |||
93 | verbose = options.verbose |
|
102 | verbose = options.verbose | |
94 | nodiff = options.nodiff |
|
103 | nodiff = options.nodiff | |
95 | coverage = options.cover or options.cover_stdlib or options.annotate |
|
104 | coverage = options.cover or options.cover_stdlib or options.annotate | |
@@ -102,6 +111,8 b' if options.interactive and options.jobs ' | |||||
102 | print '(--interactive overrides --jobs)' |
|
111 | print '(--interactive overrides --jobs)' | |
103 | options.jobs = 1 |
|
112 | options.jobs = 1 | |
104 |
|
113 | |||
|
114 | return (options, args) | |||
|
115 | ||||
105 | def rename(src, dst): |
|
116 | def rename(src, dst): | |
106 | """Like os.rename(), trade atomicity and opened files friendliness |
|
117 | """Like os.rename(), trade atomicity and opened files friendliness | |
107 | for existing destination support. |
|
118 | for existing destination support. | |
@@ -478,6 +489,7 b' def run_one(test, skips, fails):' | |||||
478 | return None |
|
489 | return None | |
479 | return ret == 0 |
|
490 | return ret == 0 | |
480 |
|
491 | |||
|
492 | (options, args) = parse_args() | |||
481 | if not options.child: |
|
493 | if not options.child: | |
482 | os.umask(022) |
|
494 | os.umask(022) | |
483 |
|
495 |
General Comments 0
You need to be logged in to leave comments.
Login now