test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows
authorMads Kiilerich <mads@kiilerich.com>
Sun, 14 Oct 2012 18:30:47 +0200
changeset 17779 f38e2873b48d
parent 17778 80fe64581f3a
child 17780 769f66861eb8
test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Regression was introduced in 6047947afb6b. Resolved by using the fine line noise '\r (no-eol) (glob) (esc)'.
tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t	Sun Oct 14 18:30:42 2012 +0200
+++ b/tests/test-subrepo-recursion.t	Sun Oct 14 18:30:47 2012 +0200
@@ -282,10 +282,10 @@
   archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
-  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
-  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
-  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
+  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   $ find ../archive | sort
   ../archive
@@ -324,10 +324,10 @@
   archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
-  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
-  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
-  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
+  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
 
 Test archiving a revision that references a subrepo that is not yet
@@ -357,10 +357,10 @@
   archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
-  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
-  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (esc)
-  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
-  archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
+  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [                                 ] 0/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+  archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
                                                               \r (no-eol) (esc)
   cloning subrepo foo from $TESTTMP/repo/foo
   cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)