X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-compress.c;h=ae41c0c4c792c5a05b4d20e9f85d808a2c7f3817;hb=93a1e66efd4b0f4cda29c467d20d0f7510c0b3a8;hp=85b033ad3419bbd7603774ce37b5a7ccfc1886e6;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c index 85b033ad3..ae41c0c4c 100644 --- a/src/journal/test-compress.c +++ b/src/journal/test-compress.c @@ -63,29 +63,29 @@ static void test_compress_decompress(int compression, r = compress(data, data_len, compressed, &csize); if (r == -ENOBUFS) { - log_info_errno(-r, "compression failed: %m"); - assert(may_fail); + log_info_errno(r, "compression failed: %m"); + assert_se(may_fail); } else { - assert(r == 0); + assert_se(r == 0); r = decompress(compressed, csize, (void **) &decompressed, &usize, &csize, 0); - assert(r == 0); + assert_se(r == 0); assert_se(decompressed); assert_se(memcmp(decompressed, data, data_len) == 0); } r = decompress("garbage", 7, (void **) &decompressed, &usize, &csize, 0); - assert(r < 0); + assert_se(r < 0); /* make sure to have the minimal lz4 compressed size */ r = decompress("00000000\1g", 9, (void **) &decompressed, &usize, &csize, 0); - assert(r < 0); + assert_se(r < 0); r = decompress("\100000000g", 9, (void **) &decompressed, &usize, &csize, 0); - assert(r < 0); + assert_se(r < 0); memzero(decompressed, usize); } @@ -108,11 +108,11 @@ static void test_decompress_startswith(int compression, r = compress(data, data_len, compressed, &csize); if (r == -ENOBUFS) { - log_info_errno(-r, "compression failed: %m"); - assert(may_fail); + log_info_errno(r, "compression failed: %m"); + assert_se(may_fail); return; } - assert(r == 0); + assert_se(r == 0); assert_se(decompress_sw(compressed, csize, @@ -175,7 +175,7 @@ static void test_compress_stream(int compression, assert_se(lseek(dst, 0, SEEK_SET) == 0); r = decompress(dst, dst2, st.st_size); - assert(r == 0); + assert_se(r == 0); assert_se(asprintf(&cmd2, "diff %s %s", srcfile, pattern2) > 0); assert_se(system(cmd2) == 0); @@ -184,12 +184,12 @@ static void test_compress_stream(int compression, assert_se(lseek(dst, 1, SEEK_SET) == 1); r = decompress(dst, dst2, st.st_size); - assert(r == -EBADMSG); + assert_se(r == -EBADMSG); assert_se(lseek(dst, 0, SEEK_SET) == 0); assert_se(lseek(dst2, 0, SEEK_SET) == 0); r = decompress(dst, dst2, st.st_size - 1); - assert(r == -EFBIG); + assert_se(r == -EFBIG); assert_se(unlink(pattern) == 0); assert_se(unlink(pattern2) == 0);