Patchwork [Bug,4483] New: NetBSD: native unzip has different whitespace

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date Dec. 25, 2014, 5:08 p.m.
Message ID <bug-4483-285@http.bz.selenic.com/>
Download mbox | patch
Permalink /patch/7236/
State Not Applicable
Headers show

Comments

mercurial-bugs@selenic.com - Dec. 25, 2014, 5:08 p.m.
http://bz.selenic.com/show_bug.cgi?id=4483

          Priority: normal
            Bug ID: 4483
                CC: mercurial-devel@selenic.com
          Assignee: bugzilla@selenic.com
           Summary: NetBSD: native unzip has different whitespace
          Severity: bug
    Classification: Unclassified
                OS: Other
          Reporter: tk@giga.or.at
          Hardware: All
            Status: UNCONFIRMED
           Version: 3.2.3
         Component: Mercurial
           Product: Mercurial

NetBSD comes with its own unzip implementation (using libarchive) which prints
slightly different whitespace when listing files with '-l'.

This results in test failures:


ERROR: test-archive.t output changed


Can the test be changed to be whitespace insensitive?

Patch

--- /scratch/devel/py-mercurial/work/mercurial-3.2.3/tests/test-archive.t
+++ /scratch/devel/py-mercurial/work/mercurial-3.2.3/tests/test-archive.t.err
@@ -108,13 +108,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
+      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
   No errors detected in compressed data of archive.zip.

 test that we can download single directories and files
@@ -225,9 +225,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
+      testing: test/baz/bletch  OK
+      testing: test/foo         OK
   No errors detected in compressed data of test.zip.

   $ hg archive -t tar - | tar tf - 2>/dev/null