Mercurial > public > mercurial-scm > hg
diff tests/test-merge-force.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 | a3fd84f4fb38 |
| children | 4764e8436b2a |
line wrap: on
line diff
--- a/tests/test-merge-force.t Tue Sep 18 22:40:03 2018 -0400 +++ b/tests/test-merge-force.t Tue Sep 18 23:47:21 2018 -0400 @@ -10,26 +10,26 @@ Create base changeset - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 1 + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 1 $ hg addremove -q --similarity 0 $ hg commit -qm 'base' Create remote changeset - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 2 + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 2 $ hg addremove -q --similarity 0 $ hg commit -qm 'remote' Create local changeset $ hg update -q 0 - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 3 + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 3 $ hg addremove -q --similarity 0 $ hg commit -qm 'local' Set up working directory - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc $ hg addremove -q --similarity 0 $ hg forget *_*_*_*-untracked $ rm *_*_*_missing-* @@ -311,7 +311,7 @@ the remote side did not touch the file $ checkstatus() { - > for f in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 3` + > for f in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 3` > do > echo > hg status -A $f @@ -692,7 +692,7 @@ missing_missing_missing_missing-untracked: * (glob) <missing> - $ for f in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 3` + $ for f in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 3` > do > if test -f ${f}.orig > then @@ -834,7 +834,7 @@ $ hg -q update --clean 2 $ hg --config extensions.purge= purge - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 3 wc + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc $ hg addremove -q --similarity 0 $ hg forget *_*_*_*-untracked $ rm *_*_*_missing-*