arm: mach-k3: add support for detecting firmware images from FIT

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

diff --git a/test/compression.c b/test/compression.c
index dc5e94684f107d76624c6276bae270c9085e677a..4cd1be564f3fdceb28678e80067b8fefdb8e0e29 100644 (file)
--- a/test/compression.c
+++ b/test/compression.c
@@ -6,6 +6,10 @@
 #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>
@@ -160,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;
@@ -195,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;
@@ -229,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;
@@ -264,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;
@@ -449,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
@@ -532,11 +536,12 @@ 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);
+       struct unit_test *tests = UNIT_TEST_SUITE_START(compression_test);
+       const int n_ents = UNIT_TEST_SUITE_COUNT(compression_test);
 
-       return cmd_ut_category("compression", tests, n_ents, argc, argv);
+       return cmd_ut_category("compression", "compression_test_",
+                              tests, n_ents, argc, argv);
 }