Merge tag 'rpi-next-2020.07.2' of https://gitlab.denx.de/u-boot/custodians/u-boot...

[oweals/u-boot.git] / test / compression.c

diff --git a/test/compression.c b/test/compression.c
index fe27ad66ea44f27167643feac988daa67c68ce2a..a2a4b9ff9e85270b23531c59a8210737dfe3f140 100644 (file)
--- a/test/compression.c
+++ b/test/compression.c
@@ -1,12 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013, The Chromium Authors
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <bootm.h>
 #include <command.h>
+#include <gzip.h>
+#include <image.h>
+#include <log.h>
+#include <lz4.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/io.h>
@@ -161,7 +164,7 @@ static int compress_using_bzip2(struct unit_test_state *uts,
 {
        /* There is no bzip2 compression in u-boot, so fake it. */
        ut_asserteq(in_size, strlen(plain));
-       ut_asserteq(0, memcmp(plain, in, in_size));
+       ut_asserteq_mem(plain, in, in_size);
 
        if (bzip2_compressed_size > out_max)
                return -1;
@@ -196,7 +199,7 @@ static int compress_using_lzma(struct unit_test_state *uts,
 {
        /* There is no lzma compression in u-boot, so fake it. */
        ut_asserteq(in_size,  strlen(plain));
-       ut_asserteq(0, memcmp(plain, in, in_size));
+       ut_asserteq_mem(plain, in, in_size);
 
        if (lzma_compressed_size > out_max)
                return -1;
@@ -230,7 +233,7 @@ static int compress_using_lzo(struct unit_test_state *uts,
 {
        /* There is no lzo compression in u-boot, so fake it. */
        ut_asserteq(in_size,  strlen(plain));
-       ut_asserteq(0, memcmp(plain, in, in_size));
+       ut_asserteq_mem(plain, in, in_size);
 
        if (lzo_compressed_size > out_max)
                return -1;
@@ -265,7 +268,7 @@ static int compress_using_lz4(struct unit_test_state *uts,
 {
        /* There is no lz4 compression in u-boot, so fake it. */
        ut_asserteq(in_size,  strlen(plain));
-       ut_asserteq(0, memcmp(plain, in, in_size));
+       ut_asserteq_mem(plain, in, in_size);
 
        if (lz4_compressed_size > out_max)
                return -1;
@@ -450,7 +453,7 @@ static int compress_using_none(struct unit_test_state *uts,
 }
 
 /**
- * run_bootm_test() - Run tests on the bootm decopmression function
+ * run_bootm_test() - Run tests on the bootm decompression function
  *
  * @comp_type: Compression type to test
  * @compress:  Our function to compress data
@@ -472,15 +475,15 @@ static int run_bootm_test(struct unit_test_state *uts, int comp_type,
        unc_len = strlen(plain);
        compress(uts, (void *)plain, unc_len, compress_buff, compress_size,
                 &compress_size);
-       err = bootm_decomp_image(comp_type, load_addr, image_start,
-                                IH_TYPE_KERNEL, map_sysmem(load_addr, 0),
-                                compress_buff, compress_size, unc_len,
-                                &load_end);
+       err = image_decomp(comp_type, load_addr, image_start,
+                          IH_TYPE_KERNEL, map_sysmem(load_addr, 0),
+                          compress_buff, compress_size, unc_len,
+                          &load_end);
        ut_assertok(err);
-       err = bootm_decomp_image(comp_type, load_addr, image_start,
-                                IH_TYPE_KERNEL, map_sysmem(load_addr, 0),
-                                compress_buff, compress_size, unc_len - 1,
-                                &load_end);
+       err = image_decomp(comp_type, load_addr, image_start,
+                          IH_TYPE_KERNEL, map_sysmem(load_addr, 0),
+                          compress_buff, compress_size, unc_len - 1,
+                          &load_end);
        ut_assert(err);
 
        /* We can't detect corruption when not decompressing */
@@ -488,10 +491,10 @@ static int run_bootm_test(struct unit_test_state *uts, int comp_type,
                return 0;
        memset(compress_buff + compress_size / 2, '\x49',
               compress_size / 2);
-       err = bootm_decomp_image(comp_type, load_addr, image_start,
-                                IH_TYPE_KERNEL, map_sysmem(load_addr, 0),
-                                compress_buff, compress_size, 0x10000,
-                                &load_end);
+       err = image_decomp(comp_type, load_addr, image_start,
+                          IH_TYPE_KERNEL, map_sysmem(load_addr, 0),
+                          compress_buff, compress_size, 0x10000,
+                          &load_end);
        ut_assert(err);
 
        return 0;
@@ -533,11 +536,13 @@ static int compression_test_bootm_none(struct unit_test_state *uts)
 }
 COMPRESSION_TEST(compression_test_bootm_none, 0);
 
-int do_ut_compression(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_ut_compression(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        struct unit_test *tests = ll_entry_start(struct unit_test,
                                                 compression_test);
        const int n_ents = ll_entry_count(struct unit_test, compression_test);
 
-       return cmd_ut_category("compression", tests, n_ents, argc, argv);
+       return cmd_ut_category("compression", "compression_test_",
+                              tests, n_ents, argc, argv);
 }