# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 1468828530 -3600
# Node ID 6ce870dba6fa81e54f2a679044986d6a14215c04
# Parent  ee96d95e81a4c1a0fe4e22588d09dfce04782e99
run-tests: make --local set --with-chg if --chg is used

--local should work with chg as well.

diff -r ee96d95e81a4 -r 6ce870dba6fa tests/run-tests.py
--- a/tests/run-tests.py	Mon Jul 18 08:45:46 2016 +0100
+++ b/tests/run-tests.py	Mon Jul 18 08:55:30 2016 +0100
@@ -214,7 +214,8 @@
     parser.add_option("-k", "--keywords",
         help="run tests matching keywords")
     parser.add_option("-l", "--local", action="store_true",
-        help="shortcut for --with-hg=<testdir>/../hg")
+        help="shortcut for --with-hg=<testdir>/../hg, "
+             "and --with-chg=<testdir>/../contrib/chg/chg if --chg is set")
     parser.add_option("--loop", action="store_true",
         help="loop tests repeatedly")
     parser.add_option("--runs-per-test", type="int", dest="runs_per_test",
@@ -310,6 +311,8 @@
         testdir = os.path.dirname(_bytespath(canonpath(sys.argv[0])))
         reporootdir = os.path.dirname(testdir)
         pathandattrs = [(b'hg', 'with_hg')]
+        if options.chg:
+            pathandattrs.append((b'contrib/chg/chg', 'with_chg'))
         for relpath, attr in pathandattrs:
             binpath = os.path.join(reporootdir, relpath)
             if os.name != 'nt' and not os.access(binpath, os.X_OK):