Mercurial > hg
changeset 10469:b26c4a89a143 stable
Fix test-push-validation under Windows
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 14 Feb 2010 18:39:16 +0100 |
| parents | 2250fc372d34 |
| children | 2b57eed1be0b |
| files | tests/filtertmp.py tests/test-push-validation tests/test-push-validation.out |
| diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/filtertmp.py Sun Feb 14 18:19:18 2010 +0100 +++ b/tests/filtertmp.py Sun Feb 14 18:39:16 2010 +0100 @@ -9,6 +9,7 @@ import sys, os input = sys.stdin.read() -input = input.replace(os.environ['HGTMP'], '$HGTMP') input = input.replace(os.sep, '/') +hgtmp = os.environ['HGTMP'].replace(os.sep, '/') +input = input.replace(hgtmp, '$HGTMP') sys.stdout.write(input)
--- a/tests/test-push-validation Sun Feb 14 18:19:18 2010 +0100 +++ b/tests/test-push-validation Sun Feb 14 18:39:16 2010 +0100 @@ -1,7 +1,5 @@ #!/bin/sh -STRIP=`pwd` - hg init test cd test cat > .hg/hgrc <<EOF @@ -21,4 +19,4 @@ echo blah >> beta hg ci -m '2 (corrupt)' mv tmp .hg/store/data/beta.i -hg push 2>&1 | sed "s%$STRIP%test-root%" +hg push 2>&1 | "$TESTDIR/filtertmp.py"
--- a/tests/test-push-validation.out Sun Feb 14 18:19:18 2010 +0100 +++ b/tests/test-push-validation.out Sun Feb 14 18:39:16 2010 +0100 @@ -2,7 +2,7 @@ adding beta updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved -pushing to test-root/test +pushing to $HGTMP/test-push-validation/test searching for changes adding changesets adding manifests