Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo-recursion.t @ 30844:b3d2e8cce78c stable
tests: work around FreeBSD's unzip having slightly different output
According to man 1 unzip, this unzip appeared in FreeBSD 8.0. It's
what comes as /usr/bin/unzip, so we may as well cater to it since it's
easy.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 18 Jan 2017 23:43:41 -0500 |
| parents | cd34bf29987e |
| children | 2406dbba49bd |
line wrap: on
line diff
--- a/tests/test-subrepo-recursion.t Wed Jan 18 23:34:35 2017 -0500 +++ b/tests/test-subrepo-recursion.t Wed Jan 18 23:43:41 2017 -0500 @@ -321,10 +321,9 @@ (unzip date formating is unstable, we do not care about it and glob it out) - $ unzip -l ../archive.zip + $ unzip -l ../archive.zip | grep -v -- ----- | egrep -v files$ Archive: ../archive.zip Length [ ]* Date [ ]* Time [ ]* Name (re) - [\- ]* (re) 172 [0-9:\- ]* .hg_archival.txt (re) 10 [0-9:\- ]* .hgsub (re) 45 [0-9:\- ]* .hgsubstate (re) @@ -333,8 +332,6 @@ 45 [0-9:\- ]* foo/.hgsubstate (re) 9 [0-9:\- ]* foo/y.txt (re) 9 [0-9:\- ]* foo/bar/z.txt (re) - [\- ]* (re) - 303 [ ]* 8 files (re) Test archiving a revision that references a subrepo that is not yet cloned: