Mercurial > hg
changeset 25728:905c32321cfb
run-tests.py: execute hghave by the path relative to run-tests.py
Before this patch, `run-tests.py` executes `hghave` by the path
relative to `TESTDIR` (= cwd of `run-tests.py` running).
This prevents third party tools for Mercurial from running
`run-tests.py`, which is placed in `tests` of Mercurial source tree,
in `tests` of own source tree. In such cases, `TESTDIR` refers the
latter `tests`, and `hghave` doesn't exist in it.
This is a one of preparations for issue4677.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Fri, 03 Jul 2015 06:56:03 +0900 |
| parents | b8245386ab40 |
| children | 57dfadc4f46c |
| files | tests/run-tests.py tests/test-run-tests.t |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Mon Jul 06 23:23:22 2015 -0400 +++ b/tests/run-tests.py Fri Jul 03 06:56:03 2015 +0900 @@ -902,7 +902,8 @@ def _hghave(self, reqs): # TODO do something smarter when all other uses of hghave are gone. - tdir = self._testdir.replace(b'\\', b'/') + runtestdir = os.path.abspath(os.path.dirname(_bytespath(__file__))) + tdir = runtestdir.replace(b'\\', b'/') proc = Popen4(b'%s -c "%s/hghave %s"' % (self._shell, tdir, b' '.join(reqs)), self._testtmp, 0, self._getenv())
--- a/tests/test-run-tests.t Mon Jul 06 23:23:22 2015 -0400 +++ b/tests/test-run-tests.t Fri Jul 03 06:56:03 2015 +0900 @@ -566,3 +566,20 @@ $ rm -f test-glob-backslash.t +Test reusability for third party tools +====================================== + + $ mkdir "$TESTTMP"/anothertests + $ cd "$TESTTMP"/anothertests + +test that `run-tests.py` can execute hghave, even if it runs not in +Mercurial source tree. + + $ cat > test-hghave.t <<EOF + > #require true + > $ echo foo + > foo + > EOF + $ run-tests.py test-hghave.t + . + # Ran 1 tests, 0 skipped, 0 warned, 0 failed.