Skip to content
Snippets Groups Projects
Commit dd384ad01d88 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

tests-racy-mutation: pass the editor through config instead of env variable

On Windows msys seems to do awful mangling of the environment variable content
that confuses everything to the death. Going through the config works fine, so
we do that instead.

Differential Revision: https://phab.mercurial-scm.org/D12479
parent dd98bd0b6501
No related branches found
No related tags found
No related merge requests found
......@@ -38,4 +38,9 @@
> EOF
#endif
$ cat >> .hg/hgrc << EOF
> [ui]
> editor=sh $TESTTMP/waitlock_editor.sh
> EOF
$ echo foo > foo
......@@ -41,3 +46,4 @@
$ echo foo > foo
$ (WAITLOCK_ANNOUNCE="${EDITOR_STARTED}" \
$ (unset HGEDITOR;
> WAITLOCK_ANNOUNCE="${EDITOR_STARTED}" \
> WAITLOCK_FILE="${MISCHIEF_MANAGED}" \
......@@ -43,5 +49,4 @@
> WAITLOCK_FILE="${MISCHIEF_MANAGED}" \
> HGEDITOR="sh $TESTTMP/waitlock_editor.sh" \
> hg commit -qAm 'r1 (foo)' --edit foo > .foo_commit_out 2>&1 ; touch "${JOBS_FINISHED}") &
Wait for the "editor" to actually start
......@@ -45,7 +50,12 @@
> hg commit -qAm 'r1 (foo)' --edit foo > .foo_commit_out 2>&1 ; touch "${JOBS_FINISHED}") &
Wait for the "editor" to actually start
$ WAITLOCK_FILE="${EDITOR_STARTED}" sh "$TESTTMP/waitlock_editor.sh"
$ sh "$RUNTESTDIR/testlib/wait-on-file" 5 "${EDITOR_STARTED}"
$ cat >> .hg/hgrc << EOF
> [ui]
> editor=
> EOF
Break the locks, and make another commit.
$ hg debuglocks -LW
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment