[arch-commits] Commit in libarchive/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, November 13, 2019 @ 17:37:22
  Author: eworm
Revision: 368374

fix tests

Added:
  libarchive/trunk/0001-test_write_filter_zstd-set-compression-level-to-7.patch
Modified:
  libarchive/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-test_write_filter_zstd-set-compression-level-to-7.patch |   32 ++++++++++
 PKGBUILD                                                     |    9 ++
 2 files changed, 39 insertions(+), 2 deletions(-)

Added: 0001-test_write_filter_zstd-set-compression-level-to-7.patch
===================================================================
--- 0001-test_write_filter_zstd-set-compression-level-to-7.patch	                        (rev 0)
+++ 0001-test_write_filter_zstd-set-compression-level-to-7.patch	2019-11-13 17:37:22 UTC (rev 368374)
@@ -0,0 +1,32 @@
+From ff1691b0ce507733c9655c9fa5c33bc0ae4d6b5d Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin at matuska.org>
+Date: Mon, 12 Aug 2019 00:14:00 +0200
+Subject: test_write_filter_zstd: set compression level to 7
+
+Fixes #1226
+---
+ libarchive/test/test_write_filter_zstd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/test/test_write_filter_zstd.c b/libarchive/test/test_write_filter_zstd.c
+index da3c8066..9fb01906 100644
+--- a/libarchive/test/test_write_filter_zstd.c
++++ b/libarchive/test/test_write_filter_zstd.c
+@@ -125,7 +125,7 @@ DEFINE_TEST(test_write_filter_zstd)
+ 	assertEqualIntA(a, ARCHIVE_OK,
+ 	    archive_write_set_filter_option(a, NULL, "compression-level", "9"));
+ 	assertEqualIntA(a, ARCHIVE_OK,
+-	    archive_write_set_filter_option(a, NULL, "compression-level", "6"));
++	    archive_write_set_filter_option(a, NULL, "compression-level", "7"));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
+ 	for (i = 0; i < 100; i++) {
+ 		sprintf(path, "file%03d", i);
+@@ -140,7 +140,7 @@ DEFINE_TEST(test_write_filter_zstd)
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+ 	assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+ 
+-	failure("compression-level=6 wrote %d bytes, default wrote %d bytes",
++	failure("compression-level=7 wrote %d bytes, default wrote %d bytes",
+ 	    (int)used2, (int)used1);
+ 	assert(used2 < used1);
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-13 17:37:18 UTC (rev 368373)
+++ PKGBUILD	2019-11-13 17:37:22 UTC (rev 368374)
@@ -11,12 +11,17 @@
 depends=(acl attr bzip2 expat lz4 openssl xz zlib zstd)
 provides=(libarchive.so)
 validpgpkeys=('CB55788360B992FA0885C878F040F7196BA99AF4') # Martin Matuska <martin at matuska.org>
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        '0001-test_write_filter_zstd-set-compression-level-to-7.patch')
 sha256sums=('8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e'
-            'SKIP')
+            'SKIP'
+            '95b2998a1061d015af2f0e21a0d3433bf21389a4ab9c8836121f18e01980451c')
 
 prepare() {
   cd $pkgname-$pkgver 
+
+  patch -Np1 < ../0001-test_write_filter_zstd-set-compression-level-to-7.patch
+
   autoreconf -fi
 }