tests: make hghave and run-tests exit on unknown feature requirements
[ original upstream message ]
--- a/tests/hghave Fri Dec 21 17:19:52 2012 +0100
+++ b/tests/hghave Mon Jan 07 02:00:43 2013 +0100
@@ -59,7 +59,7 @@
if feature not in checks:
error('skipped: unknown feature: ' + feature)
- continue
+ sys.exit(2)
check, desc = checks[feature]
try:
--- a/tests/run-tests.py Fri Dec 21 17:19:52 2012 +0100
+++ b/tests/run-tests.py Mon Jan 07 02:00:43 2013 +0100
@@ -602,10 +602,13 @@
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)
+ if ret == 2:
+ print stdout
+ sys.exit(1)
return ret == 0
f = open(test)