Patchwork [3,of,3,STABLE] tests: end output lines including path with "(glob)" to pass on Windows

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Nov. 10, 2013, 9:42 a.m.
Message ID <efd123013c03c806e2a4.1384076522@juju>
Download mbox | patch
Permalink /patch/2894/
State Accepted
Commit dcd3c47e464b751c08e6a88fe81ebe1669a14add
Headers show

Comments

Katsunori FUJIWARA - Nov. 10, 2013, 9:42 a.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1384069704 -32400
#      Sun Nov 10 16:48:24 2013 +0900
# Branch stable
# Node ID efd123013c03c806e2a4f715997193b2600af23f
# Parent  95012ec670d4e181b6141949cecffecdb8c68ca6
tests: end output lines including path with "(glob)" to pass on Windows
Matt Mackall - Nov. 13, 2013, 1:49 a.m.
On Sun, 2013-11-10 at 18:42 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1384069704 -32400
> #      Sun Nov 10 16:48:24 2013 +0900
> # Branch stable
> # Node ID efd123013c03c806e2a4f715997193b2600af23f
> # Parent  95012ec670d4e181b6141949cecffecdb8c68ca6
> tests: end output lines including path with "(glob)" to pass on Windows

These are queued for default, thanks.

Patch

diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -157,7 +157,7 @@ 
   > EOF
   $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
   ambigabs.s=libroot/ambig.py
-  $TESTTMP/a
+  $TESTTMP/a (glob)
 #endif
 
 #if no-py3k
@@ -172,7 +172,7 @@ 
   > EOF
   $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
   ambigrel.s=libroot/mod/ambig.py
-  $TESTTMP/a
+  $TESTTMP/a (glob)
 #endif
 
 Check absolute/relative import of extension specific modules
@@ -227,7 +227,7 @@ 
   (extroot) import extroot: this is extroot.__init__
   (extroot) from extroot.bar import s: this is extroot.bar
   (extroot) import extroot.bar in func(): this is extroot.bar
-  $TESTTMP/a
+  $TESTTMP/a (glob)
 
 #if no-py3k
   $ rm "$TESTTMP"/extroot/foo.*
@@ -263,7 +263,7 @@ 
   (extroot) import sub1: this is extroot.sub1.__init__
   (extroot) from bar import s: this is extroot.bar
   (extroot) import bar in func(): this is extroot.bar
-  $TESTTMP/a
+  $TESTTMP/a (glob)
 #endif
 
   $ cd ..
@@ -739,59 +739,59 @@ 
   $ echo '# enable extension locally' >> src/.hg/hgrc
   $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> src/.hg/hgrc
   $ hg -R src status
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
 
   $ hg clone -U src clone-dst1
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
   $ hg init push-dst1
   $ hg -q -R src push push-dst1
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
   $ hg init pull-src1
   $ hg -q -R pull-src1 pull src
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo '# disable extension globally and explicitly' >> $HGRCPATH
   $ echo 'reposetuptest = !' >> $HGRCPATH
   $ hg clone -U src clone-dst2
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
   $ hg init push-dst2
   $ hg -q -R src push push-dst2
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
   $ hg init pull-src2
   $ hg -q -R pull-src2 pull src
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
 
   $ echo '[extensions]' >> $HGRCPATH
   $ echo '# enable extension globally' >> $HGRCPATH
   $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> $HGRCPATH
   $ hg clone -U src clone-dst3
-  reposetup() for $TESTTMP/reposetup-test/src
-  reposetup() for $TESTTMP/reposetup-test/clone-dst3
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
+  reposetup() for $TESTTMP/reposetup-test/clone-dst3 (glob)
   $ hg init push-dst3
-  reposetup() for $TESTTMP/reposetup-test/push-dst3
+  reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
   $ hg -q -R src push push-dst3
-  reposetup() for $TESTTMP/reposetup-test/src
-  reposetup() for $TESTTMP/reposetup-test/push-dst3
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
+  reposetup() for $TESTTMP/reposetup-test/push-dst3 (glob)
   $ hg init pull-src3
-  reposetup() for $TESTTMP/reposetup-test/pull-src3
+  reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
   $ hg -q -R pull-src3 pull src
-  reposetup() for $TESTTMP/reposetup-test/pull-src3
-  reposetup() for $TESTTMP/reposetup-test/src
+  reposetup() for $TESTTMP/reposetup-test/pull-src3 (glob)
+  reposetup() for $TESTTMP/reposetup-test/src (glob)
 
   $ echo '[extensions]' >> src/.hg/hgrc
   $ echo '# disable extension locally' >> src/.hg/hgrc
   $ echo 'reposetuptest = !' >> src/.hg/hgrc
   $ hg clone -U src clone-dst4
-  reposetup() for $TESTTMP/reposetup-test/clone-dst4
+  reposetup() for $TESTTMP/reposetup-test/clone-dst4 (glob)
   $ hg init push-dst4
-  reposetup() for $TESTTMP/reposetup-test/push-dst4
+  reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
   $ hg -q -R src push push-dst4
-  reposetup() for $TESTTMP/reposetup-test/push-dst4
+  reposetup() for $TESTTMP/reposetup-test/push-dst4 (glob)
   $ hg init pull-src4
-  reposetup() for $TESTTMP/reposetup-test/pull-src4
+  reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
   $ hg -q -R pull-src4 pull src
-  reposetup() for $TESTTMP/reposetup-test/pull-src4
+  reposetup() for $TESTTMP/reposetup-test/pull-src4 (glob)
 
 disabling in command line overlays with all configuration
   $ hg --config extensions.reposetuptest=! clone -U src clone-dst5
@@ -834,8 +834,8 @@ 
   $ echo "reposetuptest = $TESTTMP/reposetuptest.py" >> parent/.hg/hgrc
   $ cp parent/.hg/hgrc parent/sub2/.hg/hgrc
   $ hg -R parent status -S -A
-  reposetup() for $TESTTMP/reposetup-test/parent
-  reposetup() for $TESTTMP/reposetup-test/parent/sub2
+  reposetup() for $TESTTMP/reposetup-test/parent (glob)
+  reposetup() for $TESTTMP/reposetup-test/parent/sub2 (glob)
   C .hgsub
   C .hgsubstate
   C sub1/1