Patchwork test-dirstate-race: stabilize for Windows

login
register
mail settings
Submitter Matt Harbison
Date June 15, 2017, 4:15 a.m.
Message ID <3529e3a150a1f92ff858.1497500101@Envy>
Download mbox | patch
Permalink /patch/21386/
State Accepted
Headers show

Comments

Matt Harbison - June 15, 2017, 4:15 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1497499018 14400
#      Wed Jun 14 23:56:58 2017 -0400
# Node ID 3529e3a150a1f92ff8586ec61a6736b174283b85
# Parent  3803dbea223e4b726d335879d1e57f688b80713b
test-dirstate-race: stabilize for Windows

Without quoting, the output after "custom merge tool" in the next test is an
abort trying to open "C:UsersMattAppData..."
Yuya Nishihara - June 15, 2017, 1:38 p.m.
On Thu, 15 Jun 2017 00:15:01 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1497499018 14400
> #      Wed Jun 14 23:56:58 2017 -0400
> # Node ID 3529e3a150a1f92ff8586ec61a6736b174283b85
> # Parent  3803dbea223e4b726d335879d1e57f688b80713b
> test-dirstate-race: stabilize for Windows

Queued, thanks.

Patch

diff --git a/tests/test-dirstate-race.t b/tests/test-dirstate-race.t
--- a/tests/test-dirstate-race.t
+++ b/tests/test-dirstate-race.t
@@ -209,7 +209,7 @@ 
   $ cat >> $TESTTMP/mergetool-race.sh << EOF
   > echo "custom merge tool"
   > printf "c2\nc3\nc4\n" > \$1
-  > hg --cwd $TESTTMP/repo status
+  > hg --cwd "$TESTTMP/repo" status
   > echo "custom merge tool end"
   > EOF
   $ cat >> $HGRCPATH << EOF