Mercurial > hg-stable

diff tests/test-run-tests.t @ 22579:36a940d82f88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: protect the run-tests.py --json test behind an hghave rule We add a rules to detect availability of a json module and skip if json is not available.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 18 Sep 2014 11:43:47 -0700
parents f166e08ece3b
children 9a20f53e436f
line wrap: on
line diff
--- a/tests/test-run-tests.t	Mon Sep 29 17:23:38 2014 -0500
+++ b/tests/test-run-tests.t	Thu Sep 18 11:43:47 2014 -0700
@@ -369,6 +369,8 @@
   Skipped test-failure.t: blacklisted
   # Ran 0 tests, 2 skipped, 0 warned, 0 failed.
 
+#if json
+
 test for --json
 ==================
 
@@ -412,3 +414,5 @@
           "time": "\s*[\d\.]{5}" (re)
       }
   } (no-eol)
+
+#endif