Use skipped: instead of hghave: for skipping tests, use this in test-merge-types

tests/hghave

@@ -133,14 +133,14 b" if __name__ == '__main__':"
             feature = feature[3:]
 
         if feature not in checks:
-            error('hghave: unknown feature: ' + feature)
+            error('skipped: unknown feature: ' + feature)
             continue
 
         check, desc = checks[feature]
         if not negate and not check():
-            error('hghave: missing feature: ' + desc)
+            error('skipped: missing feature: ' + desc)
         elif negate and check():
-            error('hghave: system supports %s' % desc)
+            error('skipped: system supports %s' % desc)
 
     if failures != 0:
         sys.exit(1)

tests/run-tests.py

@@ -19,8 +19,9 b' import sys'
 import tempfile
 import time
 
-# hghave reserved exit code to skip test
+# reserved exit code to skip test (used by hghave)
 SKIPPED_STATUS = 80
+SKIPPED_PREFIX = 'skipped: '
 
 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
 
@@ -92,10 +93,10 b' def extract_missing_features(lines):'
     '''Extract missing/unknown features log lines as a list'''
     missing = []
     for line in lines:
-        if not line.startswith('hghave: '):
+        if not line.startswith(SKIPPED_PREFIX):
             continue
         line = line.splitlines()[0]
-        missing.append(line[8:])
+        missing.append(line[len(SKIPPED_PREFIX):])
 
     return missing
 

tests/test-convert-darcs

@@ -13,7 +13,7 b' HOME=do_not_use_HOME_darcs; export HOME'
 mkdir dummy
 mkdir dummy/_darcs
 if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
-    echo 'hghave: missing feature: elementtree module'
+    echo 'skipped: missing feature: elementtree module'
     exit 80
 fi
 

tests/test-merge-types

@@ -34,3 +34,6 b' if [ -h a ]; then'
 elif [ -x a ]; then
     echo a is executable
 fi
+
+echo "skipped: test is for a known, unfixed bug"
+exit 80