tests/helper-runtests.sh
author Phil Cohen <phillco@fb.com>
Fri, 01 Dec 2017 00:07:23 -0800
changeset 35291 46d7f0713a87
parent 29220 054bcdad6042
permissions -rw-r--r--
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Merge conflicts might be supported in the future, but for now are kept out of scope. Any places where we used to call `flushall()` should be replaced with some kind of exception. At this point, IMM M1 is no longer supported. Differential Revision: https://phab.mercurial-scm.org/D1212
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