Mercurial > hg
changeset 40975:2465e0b27a0d
run-tests: alias hg to hg.exe on Windows
To enable legacy stdio mode on Windows, hg.exe needs to be updated. But before
that, we actually have to use it when running the tests. I *think* what was
happening before was when MSYS invoked `hg`, it looked at the shbang line and
ran python.exe found there. The test harness must be updating $PATH to include
the python used to launch it, and therefore it ran py3. As a side note, this
also fixed `py -3 run-tests.py` (without --local), which complained about the
space in the shbang line before this.
This should also help in WSL, because the explicit '.exe' is needed to invoke a
Windows app instead of invoking the Linux app.
I have no idea why this change capitalizes Lib in the tests, as it was
previously lowercase for both py2 and py3.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 16 Dec 2018 17:36:51 -0500 |
| parents | e1f759f1f691 |
| children | ef7119cd4965 |
| files | tests/run-tests.py tests/test-install.t tests/test-run-tests.t |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Sun Dec 16 15:47:08 2018 -0500 +++ b/tests/run-tests.py Sun Dec 16 17:36:51 2018 -0500 @@ -2640,6 +2640,9 @@ self._tmpbindir = self._bindir self._pythondir = os.path.join(self._installdir, b"lib", b"python") + if os.name == 'nt' and not self._hgcommand.endswith(b'.exe'): + self._hgcommand += b'.exe' + # set CHGHG, then replace "hg" command by "chg" chgbindir = self._bindir if self.options.chg or self.options.with_chg:
--- a/tests/test-install.t Sun Dec 16 15:47:08 2018 -0500 +++ b/tests/test-install.t Sun Dec 16 17:36:51 2018 -0500 @@ -4,7 +4,7 @@ checking Python executable (*) (glob) checking Python version (2.*) (glob) (no-py3 !) checking Python version (3.*) (glob) (py3 !) - checking Python lib (*lib*)... (glob) + checking Python lib (.*[Ll]ib.*)... (re) checking Python security support (*) (glob) TLS 1.2 not supported by Python install; network connections lack modern security (?) SNI not supported by Python install; may have connectivity issues with some servers (?) @@ -60,7 +60,7 @@ checking Python executable (*) (glob) checking Python version (2.*) (glob) (no-py3 !) checking Python version (3.*) (glob) (py3 !) - checking Python lib (*lib*)... (glob) + checking Python lib (.*[Ll]ib.*)... (re) checking Python security support (*) (glob) TLS 1.2 not supported by Python install; network connections lack modern security (?) SNI not supported by Python install; may have connectivity issues with some servers (?) @@ -105,7 +105,7 @@ checking Python executable (*) (glob) checking Python version (2.*) (glob) (no-py3 !) checking Python version (3.*) (glob) (py3 !) - checking Python lib (*lib*)... (glob) + checking Python lib (.*[Ll]ib.*)... (re) checking Python security support (*) (glob) TLS 1.2 not supported by Python install; network connections lack modern security (?) SNI not supported by Python install; may have connectivity issues with some servers (?) @@ -130,7 +130,7 @@ checking Python executable (*) (glob) checking Python version (2.*) (glob) (no-py3 !) checking Python version (3.*) (glob) (py3 !) - checking Python lib (*lib*)... (glob) + checking Python lib (.*[Ll]ib.*)... (re) checking Python security support (*) (glob) TLS 1.2 not supported by Python install; network connections lack modern security (?) SNI not supported by Python install; may have connectivity issues with some servers (?)
--- a/tests/test-run-tests.t Sun Dec 16 15:47:08 2018 -0500 +++ b/tests/test-run-tests.t Sun Dec 16 17:36:51 2018 -0500 @@ -644,12 +644,14 @@ $ rt --debug 2>&1 | grep -v pwd running 2 tests using 1 parallel processes + + alias hg=hg.exe (windows !) + echo *SALT* 0 0 (glob) *SALT* 0 0 (glob) + echo babar babar + echo *SALT* 10 0 (glob) *SALT* 10 0 (glob) + .+ alias hg=hg.exe (windows !) *+ echo *SALT* 0 0 (glob) *SALT* 0 0 (glob) + echo babar