Patchwork [2,of,2] test-pushvars: invoke shell script hook via `sh` for Windows

login
register
mail settings
Submitter Matt Harbison
Date Aug. 15, 2017, 2:35 a.m.
Message ID <26abdd16d4b9e91989aa.1502764542@Envy>
Download mbox | patch
Permalink /patch/22997/
State Accepted
Headers show

Comments

Matt Harbison - Aug. 15, 2017, 2:35 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1502764008 14400
#      Mon Aug 14 22:26:48 2017 -0400
# Node ID 26abdd16d4b9e91989aa1fce9a01030be4a42840
# Parent  1a077f01241b6256728751b00c552652d024c907
test-pushvars: invoke shell script hook via `sh` for Windows

Invoking *.sh on Windows leads to the "what program should open this?" prompt,
which stalls the test and led to the recent series of exceptions on the Windows
test machine as the runner times out.
Aaron Kushner - Aug. 15, 2017, 3:04 a.m.
Looks good to me. Thanks!

On 8/14/17, 7:36 PM, "Matt Harbison" <mharbison72@gmail.com> wrote:

    # HG changeset patch
    # User Matt Harbison <matt_harbison@yahoo.com>
    # Date 1502764008 14400
    #      Mon Aug 14 22:26:48 2017 -0400
    # Node ID 26abdd16d4b9e91989aa1fce9a01030be4a42840
    # Parent  1a077f01241b6256728751b00c552652d024c907
    test-pushvars: invoke shell script hook via `sh` for Windows
    
    Invoking *.sh on Windows leads to the "what program should open this?" prompt,
    which stalls the test and led to the recent series of exceptions on the Windows
    test machine as the runner times out.
    
    diff --git a/tests/test-pushvars.t b/tests/test-pushvars.t
    --- a/tests/test-pushvars.t
    +++ b/tests/test-pushvars.t
    @@ -8,10 +8,9 @@
       > env | egrep "^HG_USERVAR_(DEBUG|BYPASS_REVIEW)" | sort

       > exit 0

       > EOF

    -  $ chmod +x $TESTTMP/pretxnchangegroup.sh
       $ cat >> $HGRCPATH << EOF
       > [hooks]

    -  > pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
    +  > pretxnchangegroup = sh $TESTTMP/pretxnchangegroup.sh
       > [experimental]

       > bundle2-exp = true

       > EOF

    _______________________________________________
    Mercurial-devel mailing list
    Mercurial-devel@mercurial-scm.org
    https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=11neksbx1QAq_tDqkhvzZw&m=p0XFdtoc5Ad49-CsD1Ait197vg4baubCrdv5pfnd87s&s=abDmZxaJnXA1WBFT99613sl9jBFPF20_VzTw1ogMOZA&e=
Yuya Nishihara - Aug. 15, 2017, 6:52 a.m.
On Tue, 15 Aug 2017 03:04:35 +0000, Aaron Kushner wrote:
> Looks good to me. Thanks!
> 
> On 8/14/17, 7:36 PM, "Matt Harbison" <mharbison72@gmail.com> wrote:
> 
>     # HG changeset patch
>     # User Matt Harbison <matt_harbison@yahoo.com>
>     # Date 1502764008 14400
>     #      Mon Aug 14 22:26:48 2017 -0400
>     # Node ID 26abdd16d4b9e91989aa1fce9a01030be4a42840
>     # Parent  1a077f01241b6256728751b00c552652d024c907
>     test-pushvars: invoke shell script hook via `sh` for Windows

Queued, thanks.

Patch

diff --git a/tests/test-pushvars.t b/tests/test-pushvars.t
--- a/tests/test-pushvars.t
+++ b/tests/test-pushvars.t
@@ -8,10 +8,9 @@ 
   > env | egrep "^HG_USERVAR_(DEBUG|BYPASS_REVIEW)" | sort
   > exit 0
   > EOF
-  $ chmod +x $TESTTMP/pretxnchangegroup.sh
   $ cat >> $HGRCPATH << EOF
   > [hooks]
-  > pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
+  > pretxnchangegroup = sh $TESTTMP/pretxnchangegroup.sh
   > [experimental]
   > bundle2-exp = true
   > EOF