Mercurial > hg
diff tests/test-merge-tools.t @ 39707:5abc47d4ca6b
tests: quote PYTHON usage
Python3 defaults to installing under "Program Files".
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 18 Sep 2018 23:47:21 -0400 |
| parents | 82555d7186d0 |
| children | 1736450cd1df |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Tue Sep 18 22:40:03 2018 -0400 +++ b/tests/test-merge-tools.t Tue Sep 18 23:47:21 2018 -0400 @@ -68,7 +68,7 @@ override $PATH to ensure hgmerge not visible; use $PYTHON in case we're running from a devel copy, not a temp installation - $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 + $ PATH="$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -117,7 +117,7 @@ $ echo "echo fail" > false $ hg up -qC 1 - $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 + $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -131,7 +131,7 @@ $ mkdir false $ hg up -qC 1 - $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 + $ PATH="`pwd`:$BINDIR:/usr/sbin" "$PYTHON" "$BINDIR"/hg merge -r 2 merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved