##// END OF EJS Templates
tests: work around FreeBSD's unzip having slightly different output...
Augie Fackler -
r30844:b3d2e8cc stable
parent child Browse files
Show More
@@ -327,14 +327,11 b' old file -- date clamped to 1980'
327 $ hg add old
327 $ hg add old
328 $ hg commit -m old
328 $ hg commit -m old
329 $ hg archive ../old.zip
329 $ hg archive ../old.zip
330 $ unzip -l ../old.zip
330 $ unzip -l ../old.zip | grep -v -- ----- | egrep -v files$
331 Archive: ../old.zip
331 Archive: ../old.zip
332 \s*Length.* (re)
332 \s*Length.* (re)
333 *-----* (glob)
334 *172*80*00:00*old/.hg_archival.txt (glob)
333 *172*80*00:00*old/.hg_archival.txt (glob)
335 *0*80*00:00*old/old (glob)
334 *0*80*00:00*old/old (glob)
336 *-----* (glob)
337 \s*172\s+2 files (re)
338
335
339 show an error when a provided pattern matches no files
336 show an error when a provided pattern matches no files
340
337
@@ -321,10 +321,9 b' Test archiving to zip file (unzip output'
321
321
322 (unzip date formating is unstable, we do not care about it and glob it out)
322 (unzip date formating is unstable, we do not care about it and glob it out)
323
323
324 $ unzip -l ../archive.zip
324 $ unzip -l ../archive.zip | grep -v -- ----- | egrep -v files$
325 Archive: ../archive.zip
325 Archive: ../archive.zip
326 Length [ ]* Date [ ]* Time [ ]* Name (re)
326 Length [ ]* Date [ ]* Time [ ]* Name (re)
327 [\- ]* (re)
328 172 [0-9:\- ]* .hg_archival.txt (re)
327 172 [0-9:\- ]* .hg_archival.txt (re)
329 10 [0-9:\- ]* .hgsub (re)
328 10 [0-9:\- ]* .hgsub (re)
330 45 [0-9:\- ]* .hgsubstate (re)
329 45 [0-9:\- ]* .hgsubstate (re)
@@ -333,8 +332,6 b' Test archiving to zip file (unzip output'
333 45 [0-9:\- ]* foo/.hgsubstate (re)
332 45 [0-9:\- ]* foo/.hgsubstate (re)
334 9 [0-9:\- ]* foo/y.txt (re)
333 9 [0-9:\- ]* foo/y.txt (re)
335 9 [0-9:\- ]* foo/bar/z.txt (re)
334 9 [0-9:\- ]* foo/bar/z.txt (re)
336 [\- ]* (re)
337 303 [ ]* 8 files (re)
338
335
339 Test archiving a revision that references a subrepo that is not yet
336 Test archiving a revision that references a subrepo that is not yet
340 cloned:
337 cloned:
General Comments 0
You need to be logged in to leave comments. Login now