# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1357520443 -3600
# Node ID e553e222bd7e45b0d573e75756ac7eab7a9bd916
# Parent  68d1d29f6496c9af3f8b7bb5440ce116fceb93e6
tests: make hghave and run-tests exit on unknown feature requirements

[ original upstream message ]

diff -r 68d1d29f6496 -r e553e222bd7e tests/hghave
--- 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:
diff -r 68d1d29f6496 -r e553e222bd7e tests/run-tests.py
--- 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)