# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1484801021 18000
# Node ID b3d2e8cce78c04dbf6f20f0846b6ea8b622983c4
# Parent  2fb3ae89e4e1992e93826c0e3f04e4f965edb0ab
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.

diff -r 2fb3ae89e4e1 -r b3d2e8cce78c tests/test-archive.t
--- a/tests/test-archive.t	Wed Jan 18 23:34:35 2017 -0500
+++ b/tests/test-archive.t	Wed Jan 18 23:43:41 2017 -0500
@@ -327,14 +327,11 @@
   $ hg add old
   $ hg commit -m old
   $ hg archive ../old.zip
-  $ unzip -l ../old.zip
+  $ unzip -l ../old.zip | grep -v -- ----- | egrep -v files$
   Archive:  ../old.zip
   \s*Length.* (re)
-  *-----* (glob)
   *172*80*00:00*old/.hg_archival.txt (glob)
   *0*80*00:00*old/old (glob)
-  *-----* (glob)
-  \s*172\s+2 files (re)
 
 show an error when a provided pattern matches no files
 
diff -r 2fb3ae89e4e1 -r b3d2e8cce78c tests/test-subrepo-recursion.t
--- 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: