[PATCH 1 of 2] tests: glob over quoting differences in test-blackbox.t for Windows

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1 of 2] tests: glob over quoting differences in test-blackbox.t for Windows

Matt Harbison-2
# HG changeset patch
# User Matt Harbison <[hidden email]>
# Date 1550371795 18000
#      Sat Feb 16 21:49:55 2019 -0500
# Node ID f1646b79dafcca63a5681713da6e7b9db5d71afa
# Parent  5f9d057ba28c10f3b7ccadff05e060c33352337b
tests: glob over quoting differences in test-blackbox.t for Windows

diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -379,7 +379,7 @@ a '*' entry in blackbox.track is interpr
 (only look for entries with specific logged sources, otherwise this test is
 pretty brittle)
   $ hg blackbox | egrep '\[command(finish)?\]'
-  1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000) [commandfinish]> --config 'blackbox.track=*' --config 'blackbox.logsource=True' init track_star exited 0 after * seconds (glob)
+  1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000) [commandfinish]> --config *blackbox.track=* --config *blackbox.logsource=True* init track_star exited 0 after * seconds (glob)
   1970/01/01 00:00:00 bob @0000000000000000000000000000000000000000 (5000) [command]> blackbox
   $ cd $TESTTMP
 
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Reply | Threaded
Open this post in threaded view
|

[PATCH 2 of 2] tests: conditionalize msys path mangling in test-bundle.t

Matt Harbison-2
# HG changeset patch
# User Matt Harbison <[hidden email]>
# Date 1550372638 18000
#      Sat Feb 16 22:03:58 2019 -0500
# Node ID 99ed0ac693fb7c6045ecf69cf17909e8dc48a85a
# Parent  f1646b79dafcca63a5681713da6e7b9db5d71afa
tests: conditionalize msys path mangling in test-bundle.t

This broke in 252cc56c9ff6 when the variables were printed one per line.  The
only reason I can think of is that MSYS knew the former string couldn't be a
list of paths, but thinks this form is.

diff --git a/tests/test-bundle.t b/tests/test-bundle.t
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -222,6 +222,7 @@ Pull ../full.hg into empty (with hook)
   > EOF
 
 doesn't work (yet ?)
+NOTE: msys is mangling the URL below
 
 hg -R bundle://../full.hg verify
 
@@ -239,7 +240,8 @@ hg -R bundle://../full.hg verify
   HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf
   HG_SOURCE=pull
   HG_TXNID=TXN:$ID$
-  HG_URL=bundle:../full.hg
+  HG_URL=bundle:../full.hg (no-msys !)
+  HG_URL=bundle;../full.hg (msys !)
   
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2 of 2] tests: conditionalize msys path mangling in test-bundle.t

Augie Fackler-2
On Sat, Feb 16, 2019 at 10:58:50PM -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <[hidden email]>
> # Date 1550372638 18000
> #      Sat Feb 16 22:03:58 2019 -0500
> # Node ID 99ed0ac693fb7c6045ecf69cf17909e8dc48a85a
> # Parent  f1646b79dafcca63a5681713da6e7b9db5d71afa
> tests: conditionalize msys path mangling in test-bundle.t

queued, thanks
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel