run-tests: error out on `--local --with-[c]hg`
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 23 Aug 2019 08:46:49 -0700
changeset 42816 fb84730d1c5a
parent 42815 197e7326b8b8
child 42817 69506e1b3214
run-tests: error out on `--local --with-[c]hg` I don't see much reason to allow these combinations. You could use --local and override only one of --with-hg or --with-chg, but I don't see much practical use for that. It would be easy to work around anyway by passing both --with-hg and --with-chg. By erroring out, it makes the code a bit easier to reason about to allow the next few patches. Differential Revision: https://phab.mercurial-scm.org/D6759
tests/run-tests.py
--- a/tests/run-tests.py	Tue Aug 20 18:05:07 2019 -0400
+++ b/tests/run-tests.py	Fri Aug 23 08:46:49 2019 -0700
@@ -493,6 +493,8 @@
             sys.stderr.write('warning: --with-hg should specify an hg script\n')
             sys.stderr.flush()
     if options.local:
+        if options.with_hg or options.with_chg:
+            parser.error('--local cannot be used with --with-hg or --with-chg')
         testdir = os.path.dirname(_bytespath(canonpath(sys.argv[0])))
         reporootdir = os.path.dirname(testdir)
         pathandattrs = [(b'hg', 'with_hg')]