Mercurial > hg

annotate tests/helper-runtests.sh @ 40466:b57f2734ac92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: use the "correct" merge tool in `test-rebase-detach.t` The value of `HGMERGE` overrides the value passed through --config. We are about to drop this `HGMERGE` environment variable so we update the value used in config to match what is currently in use. This is another example of confusion introduced by the `HGMERGE` environment variable.
author Boris Feld <boris.feld@octobus.net>
date Thu, 01 Nov 2018 14:24:34 +0100
parents 054bcdad6042
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29220
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
1 #
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
2 # Avoid interference from actual test env:
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
3
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
4 unset HGTEST_JOBS
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
5 unset HGTEST_TIMEOUT
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
6 unset HGTEST_PORT
054bcdad6042 tests: refactor run-tests helpers
timeless <timeless@mozdev.org>
parents:
diff changeset
7 unset HGTEST_SHELL