# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2015-11-23 02:20:08
# Node ID 19b52cde2b84ae6538798127859a66d8de1accd7
# Parent  6f1f8e88f036f6706ad3ad9b7ba2fcede3bc2b81

test-resolve: fix '--tool f' invocation for Windows

Windows can't invoke a python script directly, so invoke sh.exe instead.

According to sid0, the output changes are due to the fact that 'f' is no longer
being passed all of the args that it was, but these changes aren't essential to
the test [1].

[1] https://selenic.com/pipermail/mercurial-devel/2015-November/075768.html

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -221,21 +221,7 @@ resolve <file> should re-merge file
 
 test .orig behavior with resolve
 
-  $ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig'
-  */file1~base*: (glob)
-  >>>
-  foo
-  <<<
-  */file1~other*: (glob)
-  >>>
-  foo
-  bar
-  <<<
-  $TESTTMP/repo/file1: (glob)
-  >>>
-  foo
-  baz
-  <<<
+  $ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'"
   $TESTTMP/repo/file1.orig: (glob)
   >>>
   foo