Mercurial > hg
changeset 23627:7aaf987d9e88
tests: add missing globs for Windows
I couldn't figure out how to glob the first chunk for Windows, so it's been
conditionalized.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 10 Dec 2014 22:09:46 -0500 |
| parents | 012a7b482d68 |
| children | 7d7a4848fff4 |
| files | tests/test-commit.t tests/test-rebase-mq-skip.t |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-commit.t Thu Dec 18 23:24:17 2014 -0500 +++ b/tests/test-commit.t Wed Dec 10 22:09:46 2014 -0500 @@ -470,9 +470,15 @@ > r.commitctx(c) > EOF $ $PYTHON evil-commit.py +#if windows + $ hg co --clean tip + abort: path contains illegal component: .h\xe2\x80\x8cg\\hgrc (esc) + [255] +#else $ hg co --clean tip abort: path contains illegal component: .h\xe2\x80\x8cg/hgrc (esc) [255] +#endif $ hg rollback -f repository tip rolled back to revision 1 (undo commit) @@ -489,7 +495,7 @@ > EOF $ $PYTHON evil-commit.py $ hg co --clean tip - abort: path contains illegal component: HG~1/hgrc + abort: path contains illegal component: HG~1/hgrc (glob) [255] $ hg rollback -f @@ -507,5 +513,5 @@ > EOF $ $PYTHON evil-commit.py $ hg co --clean tip - abort: path contains illegal component: HG8B6C~2/hgrc + abort: path contains illegal component: HG8B6C~2/hgrc (glob) [255]
--- a/tests/test-rebase-mq-skip.t Thu Dec 18 23:24:17 2014 -0500 +++ b/tests/test-rebase-mq-skip.t Wed Dec 10 22:09:46 2014 -0500 @@ -62,7 +62,7 @@ note: rebase of 3:148775c71080 created no changes to commit rebase merging completed updating mq patch p0.patch to 5:9ecc820b1737 - $TESTTMP/a/.hg/patches/p0.patch + $TESTTMP/a/.hg/patches/p0.patch (glob) 2 changesets found saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob) 2 changesets found