# HG changeset patch # User Augie Fackler # Date 1468601398 14400 # Node ID cda10ff3175a13cf1c64e3a1e82005add45b7582 # Parent 1a782fabf80d48e14b0913e1ada3f03a0033dafd tests: glob whitespace between path and OK in unzip(1) output FreeBSD's unzip(1) uses tabs instead of a run of spaces. diff -r 1a782fabf80d -r cda10ff3175a tests/test-archive.t --- a/tests/test-archive.t Wed Jul 13 21:49:17 2016 -0700 +++ b/tests/test-archive.t Fri Jul 15 12:49:58 2016 -0400 @@ -117,13 +117,13 @@ $ python getarchive.py "$TIP" zip > archive.zip $ unzip -t archive.zip Archive: archive.zip - testing: test-archive-1701ef1f1510/.hg_archival.txt OK - testing: test-archive-1701ef1f1510/.hgsub OK - testing: test-archive-1701ef1f1510/.hgsubstate OK - testing: test-archive-1701ef1f1510/bar OK - testing: test-archive-1701ef1f1510/baz/bletch OK - testing: test-archive-1701ef1f1510/foo OK - testing: test-archive-1701ef1f1510/subrepo/sub OK + testing: test-archive-1701ef1f1510/.hg_archival.txt*OK (glob) + testing: test-archive-1701ef1f1510/.hgsub*OK (glob) + testing: test-archive-1701ef1f1510/.hgsubstate*OK (glob) + testing: test-archive-1701ef1f1510/bar*OK (glob) + testing: test-archive-1701ef1f1510/baz/bletch*OK (glob) + testing: test-archive-1701ef1f1510/foo*OK (glob) + testing: test-archive-1701ef1f1510/subrepo/sub*OK (glob) No errors detected in compressed data of archive.zip. test that we can download single directories and files @@ -235,9 +235,9 @@ $ hg archive --config ui.archivemeta=false -t zip -r 2 test.zip $ unzip -t test.zip Archive: test.zip - testing: test/bar OK - testing: test/baz/bletch OK - testing: test/foo OK + testing: test/bar*OK (glob) + testing: test/baz/bletch*OK (glob) + testing: test/foo*OK (glob) No errors detected in compressed data of test.zip. $ hg archive -t tar - | tar tf - 2>/dev/null diff -r 1a782fabf80d -r cda10ff3175a tests/test-largefiles-wireproto.t --- a/tests/test-largefiles-wireproto.t Wed Jul 13 21:49:17 2016 -0700 +++ b/tests/test-largefiles-wireproto.t Fri Jul 15 12:49:58 2016 -0400 @@ -232,8 +232,8 @@ ... f.write(urllib2.urlopen(u).read()) $ unzip -t archive.zip Archive: archive.zip - testing: empty-default/.hg_archival.txt OK - testing: empty-default/f1 OK + testing: empty-default/.hg_archival.txt*OK (glob) + testing: empty-default/f1*OK (glob) No errors detected in compressed data of archive.zip. test 'verify' with remotestore: