Show More
@@ -133,14 +133,14 b" if __name__ == '__main__':" | |||||
133 | feature = feature[3:] |
|
133 | feature = feature[3:] | |
134 |
|
134 | |||
135 | if feature not in checks: |
|
135 | if feature not in checks: | |
136 |
error(' |
|
136 | error('skipped: unknown feature: ' + feature) | |
137 | continue |
|
137 | continue | |
138 |
|
138 | |||
139 | check, desc = checks[feature] |
|
139 | check, desc = checks[feature] | |
140 | if not negate and not check(): |
|
140 | if not negate and not check(): | |
141 |
error(' |
|
141 | error('skipped: missing feature: ' + desc) | |
142 | elif negate and check(): |
|
142 | elif negate and check(): | |
143 |
error(' |
|
143 | error('skipped: system supports %s' % desc) | |
144 |
|
144 | |||
145 | if failures != 0: |
|
145 | if failures != 0: | |
146 | sys.exit(1) |
|
146 | sys.exit(1) |
@@ -19,8 +19,9 b' import sys' | |||||
19 | import tempfile |
|
19 | import tempfile | |
20 | import time |
|
20 | import time | |
21 |
|
21 | |||
22 |
# |
|
22 | # reserved exit code to skip test (used by hghave) | |
23 | SKIPPED_STATUS = 80 |
|
23 | SKIPPED_STATUS = 80 | |
|
24 | SKIPPED_PREFIX = 'skipped: ' | |||
24 |
|
25 | |||
25 | required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] |
|
26 | required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] | |
26 |
|
27 | |||
@@ -92,10 +93,10 b' def extract_missing_features(lines):' | |||||
92 | '''Extract missing/unknown features log lines as a list''' |
|
93 | '''Extract missing/unknown features log lines as a list''' | |
93 | missing = [] |
|
94 | missing = [] | |
94 | for line in lines: |
|
95 | for line in lines: | |
95 |
if not line.startswith( |
|
96 | if not line.startswith(SKIPPED_PREFIX): | |
96 | continue |
|
97 | continue | |
97 | line = line.splitlines()[0] |
|
98 | line = line.splitlines()[0] | |
98 |
missing.append(line[ |
|
99 | missing.append(line[len(SKIPPED_PREFIX):]) | |
99 |
|
100 | |||
100 | return missing |
|
101 | return missing | |
101 |
|
102 |
@@ -13,7 +13,7 b' HOME=do_not_use_HOME_darcs; export HOME' | |||||
13 | mkdir dummy |
|
13 | mkdir dummy | |
14 | mkdir dummy/_darcs |
|
14 | mkdir dummy/_darcs | |
15 | if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then |
|
15 | if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then | |
16 |
echo ' |
|
16 | echo 'skipped: missing feature: elementtree module' | |
17 | exit 80 |
|
17 | exit 80 | |
18 | fi |
|
18 | fi | |
19 |
|
19 |
General Comments 0
You need to be logged in to leave comments.
Login now