# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2010-02-14 17:19:18
# Node ID 2250fc372d340779ad74ce2d481df9c56004e4af
# Parent  16c68fd720ab64982eaf91e912313b56c57a42de

Fix test-share and test-subrepo under Windows

diff --git a/tests/filtertmp.py b/tests/filtertmp.py
new file mode 100755
--- /dev/null
+++ b/tests/filtertmp.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+#
+# This used to be a simple sed call like:
+#
+#  $ sed "s:$HGTMP:*HGTMP*:"
+#
+# But $HGTMP has ':' under Windows which breaks the sed call.
+#
+import sys, os
+
+input = sys.stdin.read()
+input = input.replace(os.environ['HGTMP'], '$HGTMP')
+input = input.replace(os.sep, '/')
+sys.stdout.write(input)
diff --git a/tests/test-share b/tests/test-share
--- a/tests/test-share
+++ b/tests/test-share
@@ -19,7 +19,7 @@ cd repo2
   && echo "fail: .hg/store should not exist" \
   || echo "pass: .hg/store does not exist"
 # Some sed versions appends newline, some don't, and some just fails
-(cat .hg/sharedpath; echo) | head -n1 | sed "s:$HGTMP:*HGTMP*:"
+(cat .hg/sharedpath; echo) | head -n1 | "$TESTDIR/filtertmp.py"
 
 echo % commit in shared clone
 echo a >> a
diff --git a/tests/test-share.out b/tests/test-share.out
--- a/tests/test-share.out
+++ b/tests/test-share.out
@@ -5,7 +5,7 @@ updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % contents of repo2/.hg
 pass: .hg/store does not exist
-*HGTMP*/test-share/repo1/.hg
+$HGTMP/test-share/repo1/.hg
 % commit in shared clone
 % check original
 changeset:   1:8af4dc49db9e
diff --git a/tests/test-subrepo b/tests/test-subrepo
--- a/tests/test-subrepo
+++ b/tests/test-subrepo
@@ -180,7 +180,9 @@ hg -R main add
 hg -R main ci -m "add subrepos"
 cd ..
 hg clone mercurial/main mercurial2/main
-cat mercurial2/main/nested_absolute/.hg/hgrc mercurial2/main/nested_relative/.hg/hgrc | sed "s:${PWD}:/tmp:"
+cat mercurial2/main/nested_absolute/.hg/hgrc \
+    mercurial2/main/nested_relative/.hg/hgrc \
+    | "$TESTDIR/filtertmp.py"
 rm -rf mercurial mercurial2
 
 exit 0
diff --git a/tests/test-subrepo.out b/tests/test-subrepo.out
--- a/tests/test-subrepo.out
+++ b/tests/test-subrepo.out
@@ -256,6 +256,6 @@ committing subrepository nested_absolute
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [paths]
-default = /tmp/mercurial/main/nested_absolute
+default = $HGTMP/test-subrepo/sub/mercurial/main/nested_absolute
 [paths]
-default = /tmp/mercurial/main/nested_relative
+default = $HGTMP/test-subrepo/sub/mercurial/main/nested_relative