Patchwork [2,of,2] test-extension: fix load path for Windows

login
register
mail settings
Submitter Matt Harbison
Date June 10, 2017, 5:27 a.m.
Message ID <22e25748e23c4fb13232.1497072445@Envy>
Download mbox | patch
Permalink /patch/21302/
State Accepted
Headers show

Comments

Matt Harbison - June 10, 2017, 5:27 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1497067010 14400
#      Fri Jun 09 23:56:50 2017 -0400
# Node ID 22e25748e23c4fb13232a1116a61db5460a3faaf
# Parent  c0e686db51b0f071a836fbff6fa16c952252e8b9
test-extension: fix load path for Windows

The previous code was trying to load the extension from /tmp/hgtests.xxx/...,
but the actual path for tests is C:\Users\...\Temp\hgtests.xxx\...  I assume
that the former is an MSYS path that maps somewhere under C:\MinGW.
Augie Fackler - June 10, 2017, 2:05 p.m.
queued these many thanks

> On Jun 10, 2017, at 1:27 AM, Matt Harbison <mharbison72@gmail.com> wrote:
> 
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1497067010 14400
> #      Fri Jun 09 23:56:50 2017 -0400
> # Node ID 22e25748e23c4fb13232a1116a61db5460a3faaf
> # Parent  c0e686db51b0f071a836fbff6fa16c952252e8b9
> test-extension: fix load path for Windows
> 
> The previous code was trying to load the extension from /tmp/hgtests.xxx/...,
> but the actual path for tests is C:\Users\...\Temp\hgtests.xxx\...  I assume
> that the former is an MSYS path that maps somewhere under C:\MinGW.
> 
> diff --git a/tests/test-extension.t b/tests/test-extension.t
> --- a/tests/test-extension.t
> +++ b/tests/test-extension.t
> @@ -1608,7 +1608,7 @@
>   (compatibility will be dropped after Mercurial-4.6, update your code.) * (glob)
> 
> Make sure a broken uisetup doesn't globally break hg:
> -  $ cat > baduisetup.py <<EOF
> +  $ cat > $TESTTMP/baduisetup.py <<EOF
>> from mercurial import (
>>    bdiff,
>>    extensions,
> @@ -1622,7 +1622,7 @@
>> EOF
>   $ cat >> $HGRCPATH <<EOF
>> [extensions]
> -  > baduisetup = $PWD/baduisetup.py
> +  > baduisetup = $TESTTMP/baduisetup.py
>> EOF
> 
> Even though the extension fails during uisetup, hg is still basically usable:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -1608,7 +1608,7 @@ 
   (compatibility will be dropped after Mercurial-4.6, update your code.) * (glob)
 
 Make sure a broken uisetup doesn't globally break hg:
-  $ cat > baduisetup.py <<EOF
+  $ cat > $TESTTMP/baduisetup.py <<EOF
   > from mercurial import (
   >     bdiff,
   >     extensions,
@@ -1622,7 +1622,7 @@ 
   > EOF
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > baduisetup = $PWD/baduisetup.py
+  > baduisetup = $TESTTMP/baduisetup.py
   > EOF
 
 Even though the extension fails during uisetup, hg is still basically usable: