X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Ftest-compress.c;h=ae41c0c4c792c5a05b4d20e9f85d808a2c7f3817;hb=56e6c2abb8f18bba2bb9d96d66ac7e633349ddfb;hp=78b3203befe52964f22ebb3d5bef77f0e4d61ec6;hpb=c552d602ae784c0261ceeb46ace30e6189f38bb2;p=elogind.git

diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c
index 78b3203be..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("compression failed: %s", strerror(-r));
-                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("compression failed: %s", strerror(-r));
-                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);