[PATCH] run-tests: outputdir also has to be changed if $TESTDIR is not $PWD

Yuya Nishihara yuya at tcha.org
Sat Nov 18 22:46:48 EST 2017


On Sat, 18 Nov 2017 16:31:29 +0900, matthieu.laneuville at octobus.net wrote:
> # HG changeset patch
> # User Matthieu Laneuville <matthieu.laneuville at octobus.net>
> # Date 1510989120 -32400
> #      Sat Nov 18 16:12:00 2017 +0900
> # Node ID 2933f3be5afdc2ed50f6865c4f23bc0d4a8c4878
> # Parent  75013952d8d9608f73cd45f68405fbd6ec112bf2
> # EXP-Topic hg122b
> run-tests: outputdir also has to be changed if $TESTDIR is not $PWD
> 
> Following a18eef03d879, running run-tests.py from outside tests/ would lead to
> the creation of .testtimes and test-*.t.err in $PWD instead of $TESTDIR. This
> patch fixes that and updates the relevant test.
> 
> diff -r 75013952d8d9 -r 2933f3be5afd tests/run-tests.py
> --- a/tests/run-tests.py	Fri Nov 10 19:14:06 2017 +0800
> +++ b/tests/run-tests.py	Sat Nov 18 16:12:00 2017 +0900
> @@ -2363,6 +2363,9 @@ class TestRunner(object):
>              self._outputdir = canonpath(_bytespath(self.options.outputdir))
>          else:
>              self._outputdir = self._testdir
> +            if testdescs and pathname and not self._testdir.endswith(b'/'):
> +                self._outputdir += b'/'
> +                self._outputdir += pathname

Can you update this per 57d56f603f70 "run-tests: fix TESTDIR if testdescs
are absolute paths"?


More information about the Mercurial-devel mailing list