Patchwork run-tests: allow hg executable to be hg.exe

login
register
mail settings
Submitter Kostia Balytskyi
Date May 17, 2017, 8:59 p.m.
Message ID <fc5ad0312330350a1f03.1495054754@devvm1416.lla2.facebook.com>
Download mbox | patch
Permalink /patch/20664/
State Accepted
Headers show

Comments

Kostia Balytskyi - May 17, 2017, 8:59 p.m.
# HG changeset patch
# User Kostia Balytskyi <ikostia@fb.com>
# Date 1495050700 25200
#      Wed May 17 12:51:40 2017 -0700
# Node ID fc5ad0312330350a1f03ab036530935764592334
# Parent  2d19664e257da7ad5cb97150d81838c25872fac7
run-tests: allow hg executable to be hg.exe

When running tests on Windows (via msys), user sometimes does not want to run
them against source hg, but against compiled hg.exe. For that purpose,
--with-hg option can be used, but currently run-tests.py prints a warning if
the value of this argument is not a file with basename 'hg'. This patch allows
such file to be 'hg.exe'.
Sean Farley - May 17, 2017, 9:07 p.m.
Kostia Balytskyi <ikostia@fb.com> writes:

> # HG changeset patch
> # User Kostia Balytskyi <ikostia@fb.com>
> # Date 1495050700 25200
> #      Wed May 17 12:51:40 2017 -0700
> # Node ID fc5ad0312330350a1f03ab036530935764592334
> # Parent  2d19664e257da7ad5cb97150d81838c25872fac7
> run-tests: allow hg executable to be hg.exe
>
> When running tests on Windows (via msys), user sometimes does not want to run
> them against source hg, but against compiled hg.exe. For that purpose,
> --with-hg option can be used, but currently run-tests.py prints a warning if
> the value of this argument is not a file with basename 'hg'. This patch allows
> such file to be 'hg.exe'.

A quick "looks good to me" (about to head out and I'd rather not rush
bungling running the tests)
Augie Fackler - May 19, 2017, 9:21 p.m.
On Wed, May 17, 2017 at 04:07:02PM -0500, Sean Farley wrote:
> Kostia Balytskyi <ikostia@fb.com> writes:
>
> > # HG changeset patch
> > # User Kostia Balytskyi <ikostia@fb.com>
> > # Date 1495050700 25200
> > #      Wed May 17 12:51:40 2017 -0700
> > # Node ID fc5ad0312330350a1f03ab036530935764592334
> > # Parent  2d19664e257da7ad5cb97150d81838c25872fac7
> > run-tests: allow hg executable to be hg.exe
> >
> > When running tests on Windows (via msys), user sometimes does not want to run
> > them against source hg, but against compiled hg.exe. For that purpose,
> > --with-hg option can be used, but currently run-tests.py prints a warning if
> > the value of this argument is not a file with basename 'hg'. This patch allows
> > such file to be 'hg.exe'.
>
> A quick "looks good to me" (about to head out and I'd rather not rush
> bungling running the tests)

also looks fine to me, queued


> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -341,7 +341,7 @@  def parseargs(args, parser):
         if not (os.path.isfile(options.with_hg) and
                 os.access(options.with_hg, os.X_OK)):
             parser.error('--with-hg must specify an executable hg script')
-        if not os.path.basename(options.with_hg) == b'hg':
+        if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']:
             sys.stderr.write('warning: --with-hg should specify an hg script\n')
     if options.local:
         testdir = os.path.dirname(_bytespath(canonpath(sys.argv[0])))