Patchwork tests: adjust quoting to keep Windows happy with recent $PYTHON change

login
register
mail settings
Submitter Matt Harbison
Date June 21, 2017, 4:14 a.m.
Message ID <a29007ca5b35d9319e61.1498018481@Envy>
Download mbox | patch
Permalink /patch/21576/
State Accepted
Headers show

Comments

Matt Harbison - June 21, 2017, 4:14 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1498015425 14400
#      Tue Jun 20 23:23:45 2017 -0400
# Node ID a29007ca5b35d9319e617be608c6d5e00857a389
# Parent  b5305a499dfc7a84412d03b53f08f2afc26f86aa
tests: adjust quoting to keep Windows happy with recent $PYTHON change

I tried adding quotes to the $PYTHON variable, and also tried converting the
path from the current 'c:/Python/python.exe' form to '/c/python/python.exe', but
neither worked.  I'm not sure why one of these needs '\"' around the variable
and the other doesn't.
Yuya Nishihara - June 21, 2017, 3:22 p.m.
On Wed, 21 Jun 2017 00:14:41 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1498015425 14400
> #      Tue Jun 20 23:23:45 2017 -0400
> # Node ID a29007ca5b35d9319e617be608c6d5e00857a389
> # Parent  b5305a499dfc7a84412d03b53f08f2afc26f86aa
> tests: adjust quoting to keep Windows happy with recent $PYTHON change

Queued, thanks.

> I tried adding quotes to the $PYTHON variable, and also tried converting the
> path from the current 'c:/Python/python.exe' form to '/c/python/python.exe', but
> neither worked.  I'm not sure why one of these needs '\"' around the variable
> and the other doesn't.

Just guess. That might be because of --command "" vs --command="".

Patch

diff --git a/tests/test-bisect.t b/tests/test-bisect.t
--- a/tests/test-bisect.t
+++ b/tests/test-bisect.t
@@ -463,12 +463,12 @@ 
   $ chmod +x script.py
   $ hg bisect -r
   $ hg up -qr tip
-  $ hg bisect --command "$PYTHON \"$TESTTMP/script.py\" and some parameters"
+  $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
   changeset 31:58c80a7c8a40: good
   abort: cannot bisect (no known bad revisions)
   [255]
   $ hg up -qr 0
-  $ hg bisect --command "$PYTHON \"$TESTTMP/script.py\" and some parameters"
+  $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
   changeset 0:b99c7b9c8e11: bad
   changeset 15:e7fa0811edb0: good
   changeset 7:03750880c6b5: good
diff --git a/tests/test-import.t b/tests/test-import.t
--- a/tests/test-import.t
+++ b/tests/test-import.t
@@ -64,7 +64,7 @@ 
   added 1 changesets with 2 changes to 2 files
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ HGEDITOR=cat hg --config ui.patch='$PYTHON ../dummypatch.py' --cwd b import --edit ../exported-tip.patch
+  $ HGEDITOR=cat hg --config ui.patch="$PYTHON ../dummypatch.py" --cwd b import --edit ../exported-tip.patch
   applying ../exported-tip.patch
   second change