# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-01-30 18:40:07
# Node ID ef60083b553623192ca1627954168bee2e494362
# Parent  9de9727cea5370154efc4a9559878d650b0d2516

tests: fix for windows - slashes and no serve

diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -86,7 +86,7 @@ attack /tmp/test
   $ hg manifest -r4
   /tmp/test
   $ hg update -Cr4
-  abort: path contains illegal component: /tmp/test
+  abort: path contains illegal component: /tmp/test (glob)
   [255]
 
   $ cd ..
diff --git a/tests/test-dispatch.t b/tests/test-dispatch.t
--- a/tests/test-dispatch.t
+++ b/tests/test-dispatch.t
@@ -46,10 +46,11 @@ Missing arg:
 
   $ cd "$TESTTMP"
 
-OSError ... and with filename even when it is empty
+OSError "No such file or directory" / "The system cannot find the path
+specified" should include filename even when it is empty
 
   $ hg -R a archive ''
-  abort: No such file or directory: ''
+  abort: *: '' (glob)
   [255]
 
 #if no-outer-repo
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -87,7 +87,7 @@ Implicit -R:
   abort: no repository found in '$TESTTMP' (.hg not found)!
   [255]
   $ hg -R b ann a/a
-  abort: a/a not under root '$TESTTMP/b'
+  abort: a/a not under root '$TESTTMP/b' (glob)
   [255]
   $ hg log
   abort: no repository found in '$TESTTMP' (.hg not found)!
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1182,7 +1182,7 @@ revert some files to an older revision
   $ pwd
   $TESTTMP/e
   $ hg paths
-  default = $TESTTMP/d
+  default = $TESTTMP/d (glob)
 
   $ hg verify --large
   checking changesets
@@ -1212,7 +1212,7 @@ revert some files to an older revision
   $ hg verify -q --large --lfc
   searching 1 changesets for largefiles
   changeset 9:598410d3eb9a: sub/large4: contents differ
-    ($TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928:
+    ($TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928: (glob)
     expected hash e166e74c7303192238d60af5a9c4ce9bef0b7928,
     but got 1f19b76d5b3cad1472c87efb42b582c97e040060)
   verified contents of 3 revisions of 3 largefiles
@@ -1232,19 +1232,19 @@ revert some files to an older revision
   changeset 1:ce8896473775: large1 missing
     (looked for hash 5f78770c0e77ba4287ad6ef3071c9bf9c379742f)
   changeset 1:ce8896473775: sub/large2: contents differ
-    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4:
+    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob)
     expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4,
     but got cfef678f24d3e339944138ecdd8fd85ca21d820f)
   changeset 3:9e8fbc4bce62: large1: contents differ
-    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4:
+    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob)
     expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4,
     but got cfef678f24d3e339944138ecdd8fd85ca21d820f)
   changeset 4:74c02385b94c: large3: contents differ
-    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4:
+    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob)
     expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4,
     but got cfef678f24d3e339944138ecdd8fd85ca21d820f)
   changeset 4:74c02385b94c: sub/large4: contents differ
-    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4:
+    ($TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4: (glob)
     expected hash eb7338044dc27f9bc59b8dd5a246b065ead7a9c4,
     but got cfef678f24d3e339944138ecdd8fd85ca21d820f)
   verified contents of 15 revisions of 6 largefiles
@@ -1343,8 +1343,8 @@ Test status after merging with a branch 
 
 - revert should be able to revert files introduced in a pending merge
   $ hg revert --all -r .
-  removing .hglf/large
-  undeleting .hglf/sub2/large6
+  removing .hglf/large (glob)
+  undeleting .hglf/sub2/large6 (glob)
 
 Test that a normal file and a largefile with the same name and path cannot
 coexist.
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -708,6 +708,8 @@ Do not warn about new head when the new 
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
 
+#if serve
+
 check hgweb does not explode
 ====================================
 
@@ -756,3 +758,4 @@ Checking _enable=False warning if obsole
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add celestine
   
+#endif
diff --git a/tests/test-parents.t b/tests/test-parents.t
--- a/tests/test-parents.t
+++ b/tests/test-parents.t
@@ -71,7 +71,7 @@ hg parents c, single revision
   
 
   $ hg parents -r 2 ../a
-  abort: ../a not under root '$TESTTMP/repo'
+  abort: ../a not under root '$TESTTMP/repo' (glob)
   [255]
 
 
diff --git a/tests/test-push-validation.t b/tests/test-push-validation.t
--- a/tests/test-push-validation.t
+++ b/tests/test-push-validation.t
@@ -44,7 +44,7 @@ Expected to fail:
   [1]
 
   $ hg push
-  pushing to $TESTTMP/test
+  pushing to $TESTTMP/test (glob)
   searching for changes
   adding changesets
   adding manifests
diff --git a/tests/test-rename.t b/tests/test-rename.t
--- a/tests/test-rename.t
+++ b/tests/test-rename.t
@@ -612,7 +612,7 @@ check illegal path components
   [255]
   $ hg status -C
   $ hg rename d1/d11/a1 ..
-  abort: ../a1 not under root '$TESTTMP'
+  abort: ../a1 not under root '$TESTTMP' (glob)
   [255]
   $ hg status -C
 
diff --git a/tests/test-walk.t b/tests/test-walk.t
--- a/tests/test-walk.t
+++ b/tests/test-walk.t
@@ -181,10 +181,10 @@
   f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
   f  mammals/skunk                   mammals/skunk
   $ hg debugwalk ..
-  abort: .. not under root '$TESTTMP/t'
+  abort: .. not under root '$TESTTMP/t' (glob)
   [255]
   $ hg debugwalk beans/../..
-  abort: beans/../.. not under root '$TESTTMP/t'
+  abort: beans/../.. not under root '$TESTTMP/t' (glob)
   [255]
   $ hg debugwalk .hg
   abort: path contains illegal component: .hg (glob)
@@ -209,7 +209,7 @@ Test absolute paths:
   f  beans/pinto     beans/pinto
   f  beans/turtle    beans/turtle
   $ hg debugwalk `pwd`/..
-  abort: $TESTTMP/t/.. not under root '$TESTTMP/t'
+  abort: $TESTTMP/t/.. not under root '$TESTTMP/t' (glob)
   [255]
 
 Test patterns: