Patchwork [08,of,11,STABLE] tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 20, 2014, 1:27 p.m.
Message ID <c4062d5dd1a5ca690d72.1413811622@juju>
Download mbox | patch
Permalink /patch/6423/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Oct. 20, 2014, 1:27 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1413810488 -32400
#      Mon Oct 20 22:08:08 2014 +0900
# Branch stable
# Node ID c4062d5dd1a5ca690d722d4ca6d436bed7435c54
# Parent  670e98c9c9f1935c38466c5790b7ad4864a62609
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows

This patch follows the style of other tests avoiding same kind of issue.

Patch

diff --git a/tests/test-largefiles-update.t b/tests/test-largefiles-update.t
--- a/tests/test-largefiles-update.t
+++ b/tests/test-largefiles-update.t
@@ -116,8 +116,13 @@  Test that "hg rollback" restores status 
   $ hg commit -m 'will be rollback-ed soon'
   $ echo largeY > largeY
   $ hg add --large largeY
+#if windows
+  $ hg status -A large1
+  large1: * (glob)
+#else
   $ hg status -A large1
   large1: No such file or directory
+#endif
   $ hg status -A large2
   ? large2
   $ hg status -A largeX
@@ -202,24 +207,39 @@  automated commit like rebase/transplant
   $ hg commit -m '#4'
 
   $ hg rebase -s 1 -d 2 --keep
+#if windows
+  $ hg status -A large1
+  large1: * (glob)
+#else
   $ hg status -A large1
   large1: No such file or directory
+#endif
   $ hg status -A largeX
   C largeX
   $ hg strip -q 5
 
   $ hg update -q -C 2
   $ hg transplant -q 1 4
+#if windows
+  $ hg status -A large1
+  large1: * (glob)
+#else
   $ hg status -A large1
   large1: No such file or directory
+#endif
   $ hg status -A largeX
   C largeX
   $ hg strip -q 5
 
   $ hg update -q -C 2
   $ hg transplant -q --merge 1 --merge 4
+#if windows
+  $ hg status -A large1
+  large1: * (glob)
+#else
   $ hg status -A large1
   large1: No such file or directory
+#endif
   $ hg status -A largeX
   C largeX
   $ hg strip -q 5