gnu/packages/patches/libarchive-fix-lzo-test-case.patch

   1 Description: This patch fixes test cases for LZO write support in various
   2  architectures, such as armhf. Writing a certain amount of files would
   3  cause the LZO compressor level 9 to produce a bigger archive than the
   4  default compressor level.
   5 Author: Andres Mejia <amejia@debian.org>
   6
   7 --- a/libarchive/test/test_write_filter_lzop.c
   8 +++ b/libarchive/test/test_write_filter_lzop.c
   9 @@ -39,7 +39,7 @@
  10         size_t buffsize, datasize;
  11         char path[16];
  12         size_t used1, used2;
  13 -       int i, r, use_prog = 0;
  14 +       int i, r, use_prog = 0, filecount;
  15
  16         assert((a = archive_write_new()) != NULL);
  17         r = archive_write_add_filter_lzop(a);
  18 @@ -58,9 +58,10 @@
  19
  20         datasize = 10000;
  21         assert(NULL != (data = (char *)calloc(1, datasize)));
  22 +       filecount = 10;
  23
  24         /*
  25 -        * Write a 100 files and read them all back.
  26 +        * Write a filecount files and read them all back.
  27          */
  28         assert((a = archive_write_new()) != NULL);
  29         assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a));
  30 @@ -77,7 +78,7 @@
  31         assert((ae = archive_entry_new()) != NULL);
  32         archive_entry_set_filetype(ae, AE_IFREG);
  33         archive_entry_set_size(ae, datasize);
  34 -       for (i = 0; i < 100; i++) {
  35 +       for (i = 0; i < filecount; i++) {
  36                 sprintf(path, "file%03d", i);
  37                 archive_entry_copy_pathname(ae, path);
  38                 assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
  39 @@ -97,7 +98,7 @@
  40         } else {
  41                 assertEqualIntA(a, ARCHIVE_OK,
  42                     archive_read_open_memory(a, buff, used1));
  43 -               for (i = 0; i < 100; i++) {
  44 +               for (i = 0; i < filecount; i++) {
  45                         sprintf(path, "file%03d", i);
  46                         if (!assertEqualInt(ARCHIVE_OK,
  47                                 archive_read_next_header(a, &ae)))
  48 @@ -133,7 +134,7 @@
  49             archive_write_set_options(a, "lzop:compression-level=9"));
  50         assertEqualIntA(a, ARCHIVE_OK,
  51             archive_write_open_memory(a, buff, buffsize, &used2));
  52 -       for (i = 0; i < 100; i++) {
  53 +       for (i = 0; i < filecount; i++) {
  54                 sprintf(path, "file%03d", i);
  55                 assert((ae = archive_entry_new()) != NULL);
  56                 archive_entry_copy_pathname(ae, path);
  57 @@ -161,7 +162,7 @@
  58                     archive_read_support_filter_all(a));
  59                 assertEqualIntA(a, ARCHIVE_OK,
  60                     archive_read_open_memory(a, buff, used2));
  61 -               for (i = 0; i < 100; i++) {
  62 +               for (i = 0; i < filecount; i++) {
  63                         sprintf(path, "file%03d", i);
  64                         if (!assertEqualInt(ARCHIVE_OK,
  65                                 archive_read_next_header(a, &ae)))
  66 @@ -186,7 +187,7 @@
  67             archive_write_set_filter_option(a, NULL, "compression-level", "1"));
  68         assertEqualIntA(a, ARCHIVE_OK,
  69             archive_write_open_memory(a, buff, buffsize, &used2));
  70 -       for (i = 0; i < 100; i++) {
  71 +       for (i = 0; i < filecount; i++) {
  72                 sprintf(path, "file%03d", i);
  73                 assert((ae = archive_entry_new()) != NULL);
  74                 archive_entry_copy_pathname(ae, path);
  75 @@ -216,7 +217,7 @@
  76         } else {
  77                 assertEqualIntA(a, ARCHIVE_OK,
  78                     archive_read_open_memory(a, buff, used2));
  79 -               for (i = 0; i < 100; i++) {
  80 +               for (i = 0; i < filecount; i++) {
  81                         sprintf(path, "file%03d", i);
  82                         if (!assertEqualInt(ARCHIVE_OK,
  83                                 archive_read_next_header(a, &ae)))