Skip to content
Snippets Groups Projects
Commit 77d06793 authored by kiilerix's avatar kiilerix
Browse files

tests: make hghave and run-tests exit on unknown feature requirements

parent 1528ff6a
No related branches found
No related tags found
No related merge requests found
......@@ -59,7 +59,7 @@
if feature not in checks:
error('skipped: unknown feature: ' + feature)
continue
sys.exit(2)
check, desc = checks[feature]
try:
......
......@@ -602,7 +602,7 @@
tdir = TESTDIR.replace('\\', '/')
proc = Popen4('%s -c "%s/hghave %s"' %
(options.shell, tdir, ' '.join(reqs)), wd, 0)
proc.communicate()
stdout, stderr = proc.communicate()
ret = proc.wait()
if wifexited(ret):
ret = os.WEXITSTATUS(ret)
......@@ -606,6 +606,9 @@
ret = proc.wait()
if wifexited(ret):
ret = os.WEXITSTATUS(ret)
if ret == 2:
print stdout
sys.exit(1)
return ret == 0
f = open(test)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment