tests/helper-runtests.sh
author Kyle Lippincott <spectral@google.com>
Sat, 20 Jan 2018 15:33:48 -0800
changeset 35908 a9802c9ecfb5
parent 29220 054bcdad6042
permissions -rw-r--r--
merge: use operation-provided labels (ex: dest/source) in several merge-tools Tools that did not use labels already, used only one, or used some label other than the exact strings of "local" or "other" were unmodified. Cases that used the label "base" were modified as well, if they were otherwise changed in this CL; "merged" was *not* changed. There are other possible changes we might want to make, but I didn't: - bcompare (linux and osx) uses the labels "parent1" and "parent2" instead of "local" and "other", so it was left alone, even though beyondcompare3 (windows) *was* changed. - araxis used the labels "Other", "Base", and "Local :$local", so it was also left alone. - UltraCompare didn't provide a label for 'local', just for 'base' and 'other', so it was left alone. Differential Revision: https://phab.mercurial-scm.org/D2012
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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