Patchwork [2,of,5,STABLE] tests: use "?" to glob both ":" and "; " in output for test portability

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 28, 2016, 6:16 p.m.
Message ID <fe612ab5eeff700b808a.1477678607@juju>
Download mbox | patch
Permalink /patch/17214/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Oct. 28, 2016, 6:16 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1477677894 -32400
#      Sat Oct 29 03:04:54 2016 +0900
# Branch stable
# Node ID fe612ab5eeff700b808a1d85013fa3472517a3d6
# Parent  34a5f6c66bc5a13381a68d08f73d858916167836
tests: use "?" to glob both ":" and ";" in output for test portability

If environment variable looks like PATH or so (e.g. any of components
joined by ":" contains "/"), ":" in it is replaced with ";" by MinGW
at spawning Windows native process, to follow path concatenation style
of Windows.

Therefore, "bundle:../full.hg" is converted into "bundle;..\full.hg"
on MinGW.

Difference between "/" and "\" is automatically ignored by "(glob)",
but difference between ":" and ";" should be globed explicitly.

Patch

diff --git a/tests/test-bundle.t b/tests/test-bundle.t
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -232,7 +232,7 @@  hg -R bundle://../full.hg verify
   adding manifests
   adding file changes
   added 9 changesets with 7 changes to 4 files (+1 heads)
-  changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=bundle:../full.hg (glob)
+  changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=bundle?../full.hg (glob)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Rollback empty