##// END OF EJS Templates
tests-racy-mutation: pass the editor through config instead of env variable...
marmoute -
r49922:dd384ad0 stable
parent child Browse files
Show More
@@ -38,14 +38,24 b' Start an hg commit that will take a whil'
38 > EOF
38 > EOF
39 #endif
39 #endif
40
40
41 $ cat >> .hg/hgrc << EOF
42 > [ui]
43 > editor=sh $TESTTMP/waitlock_editor.sh
44 > EOF
45
41 $ echo foo > foo
46 $ echo foo > foo
42 $ (WAITLOCK_ANNOUNCE="${EDITOR_STARTED}" \
47 $ (unset HGEDITOR;
48 > WAITLOCK_ANNOUNCE="${EDITOR_STARTED}" \
43 > WAITLOCK_FILE="${MISCHIEF_MANAGED}" \
49 > WAITLOCK_FILE="${MISCHIEF_MANAGED}" \
44 > HGEDITOR="sh $TESTTMP/waitlock_editor.sh" \
45 > hg commit -qAm 'r1 (foo)' --edit foo > .foo_commit_out 2>&1 ; touch "${JOBS_FINISHED}") &
50 > hg commit -qAm 'r1 (foo)' --edit foo > .foo_commit_out 2>&1 ; touch "${JOBS_FINISHED}") &
46
51
47 Wait for the "editor" to actually start
52 Wait for the "editor" to actually start
48 $ WAITLOCK_FILE="${EDITOR_STARTED}" sh "$TESTTMP/waitlock_editor.sh"
53 $ sh "$RUNTESTDIR/testlib/wait-on-file" 5 "${EDITOR_STARTED}"
54
55 $ cat >> .hg/hgrc << EOF
56 > [ui]
57 > editor=
58 > EOF
49
59
50 Break the locks, and make another commit.
60 Break the locks, and make another commit.
51 $ hg debuglocks -LW
61 $ hg debuglocks -LW
General Comments 0
You need to be logged in to leave comments. Login now