Mercurial > hg
diff tests/test-revert.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 | cb70501d8b71 |
children | e0a7cfa9323f |
line wrap: on
line diff
--- a/tests/test-revert.t Tue Sep 18 22:40:03 2018 -0400 +++ b/tests/test-revert.t Tue Sep 18 23:47:21 2018 -0400 @@ -495,7 +495,7 @@ check list of planned files - $ $PYTHON $TESTDIR/generate-working-copy-states.py filelist 2 + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 2 content1_content1_content1-tracked content1_content1_content1-untracked content1_content1_content3-tracked @@ -550,7 +550,7 @@ Generate base changeset - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 1 + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 1 $ hg addremove --similarity 0 adding content1_content1_content1-tracked adding content1_content1_content1-untracked @@ -597,7 +597,7 @@ (create a simple text version of the content) - $ $PYTHON ../dircontent.py > ../content-base.txt + $ "$PYTHON" ../dircontent.py > ../content-base.txt $ cat ../content-base.txt content1 content1_content1_content1-tracked content1 content1_content1_content1-untracked @@ -622,7 +622,7 @@ Create parent changeset - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 2 + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 2 $ hg addremove --similarity 0 removing content1_missing_content1-tracked removing content1_missing_content1-untracked @@ -661,7 +661,7 @@ (create a simple text version of the content) - $ $PYTHON ../dircontent.py > ../content-parent.txt + $ "$PYTHON" ../dircontent.py > ../content-parent.txt $ cat ../content-parent.txt content1 content1_content1_content1-tracked content1 content1_content1_content1-untracked @@ -686,7 +686,7 @@ Setup working directory - $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 wc + $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 2 wc $ hg addremove --similarity 0 adding content1_missing_content1-tracked adding content1_missing_content1-untracked @@ -754,7 +754,7 @@ (create a simple text version of the content) - $ $PYTHON ../dircontent.py > ../content-wc.txt + $ "$PYTHON" ../dircontent.py > ../content-wc.txt $ cat ../content-wc.txt content1 content1_content1_content1-tracked content1 content1_content1_content1-untracked @@ -818,7 +818,7 @@ The diff is filtered to include change only. The only difference should be additional `.orig` backup file when applicable. - $ $PYTHON ../dircontent.py > ../content-parent-all.txt + $ "$PYTHON" ../dircontent.py > ../content-parent-all.txt $ cd .. $ diff -U 0 -- content-parent.txt content-parent-all.txt | grep _ +content3 content1_content1_content3-tracked.orig @@ -875,7 +875,7 @@ The diff is filtered to include change only. The only difference should be additional `.orig` backup file when applicable. - $ $PYTHON ../dircontent.py > ../content-base-all.txt + $ "$PYTHON" ../dircontent.py > ../content-base-all.txt $ cd .. $ diff -U 0 -- content-base.txt content-base-all.txt | grep _ +content3 content1_content1_content3-tracked.orig @@ -902,7 +902,7 @@ revert all files individually and check the output (output is expected to be different than in the --all case) - $ for file in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 2`; do + $ for file in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 2`; do > echo '### revert for:' $file; > hg revert $file; > echo @@ -979,7 +979,7 @@ check resulting directory against the --all run (There should be no difference) - $ $PYTHON ../dircontent.py > ../content-parent-explicit.txt + $ "$PYTHON" ../dircontent.py > ../content-parent-explicit.txt $ cd .. $ diff -U 0 -- content-parent-all.txt content-parent-explicit.txt | grep _ [1] @@ -995,7 +995,7 @@ revert all files individually and check the output (output is expected to be different than in the --all case) - $ for file in `$PYTHON $TESTDIR/generate-working-copy-states.py filelist 2`; do + $ for file in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 2`; do > echo '### revert for:' $file; > hg revert $file --rev 'desc(base)'; > echo @@ -1072,7 +1072,7 @@ check resulting directory against the --all run (There should be no difference) - $ $PYTHON ../dircontent.py > ../content-base-explicit.txt + $ "$PYTHON" ../dircontent.py > ../content-base-explicit.txt $ cd .. $ diff -U 0 -- content-base-all.txt content-base-explicit.txt | grep _ [1]