Mercurial > dovecot > core-2.2
changeset 21644:eb6a6d44d977
lib-compression: Fix test-compression to build without zlib
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Mon, 20 Feb 2017 14:26:41 +0200 |
| parents | 19ec1861e84f |
| children | a66e16598d6e |
| files | src/lib-compression/test-compression.c |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-compression/test-compression.c Mon Feb 20 14:07:23 2017 +0200 +++ b/src/lib-compression/test-compression.c Mon Feb 20 14:26:41 2017 +0200 @@ -7,7 +7,6 @@ #include "sha1.h" #include "randgen.h" #include "test-common.h" -#include "istream-zlib.h" #include "compression.h" #include <unistd.h> @@ -155,13 +154,14 @@ static void test_gz_no_concat(void) { - test_begin("gz concat"); + test_begin("gz no concat"); test_gz("hello", ""); test_end(); } static void test_gz_large_header(void) { + const struct compression_handler *gz = compression_lookup_handler("gz"); static const unsigned char gz_input[] = { 0x1f, 0x8b, 0x08, 0x08, 'a','a','a','a','a','a','a','a','a','a','a', @@ -170,6 +170,9 @@ struct istream *file_input, *input; size_t i; + if (gz == NULL || gz->create_istream == NULL) + return; /* not compiled in */ + test_begin("gz large header"); /* max buffer size smaller than gz header */ @@ -178,7 +181,7 @@ test_istream_set_size(file_input, i); test_istream_set_max_buffer_size(file_input, i); - input = i_stream_create_gz(file_input, FALSE); + input = gz->create_istream(file_input, FALSE); test_assert_idx(i_stream_read(input) == 0, i); test_assert_idx(i_stream_read(input) == -1 && input->stream_errno == EINVAL, i); @@ -188,7 +191,7 @@ /* max buffer size is exactly the gz header */ file_input = test_istream_create_data(gz_input, sizeof(gz_input)); - input = i_stream_create_gz(file_input, FALSE); + input = gz->create_istream(file_input, FALSE); test_istream_set_size(input, i); test_istream_set_allow_eof(input, FALSE); test_istream_set_max_buffer_size(input, i);