Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
Jeremy Soller
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions

View File

@@ -51,12 +51,12 @@ static int setup_ulzman_file(void **state)
if (!s)
return 1;
const size_t raw_filename_size = strlen(path_prefix) + strlen(fname_base)
+ ARRAY_SIZE(raw_file_suffix);
const size_t raw_filename_size =
strlen(path_prefix) + strlen(fname_base) + ARRAY_SIZE(raw_file_suffix);
s->raw_filename = test_malloc(raw_filename_size);
const size_t comp_filename_size = strlen(path_prefix) + strlen(fname_base)
+ ARRAY_SIZE(comp_file_suffix);
const size_t comp_filename_size =
strlen(path_prefix) + strlen(fname_base) + ARRAY_SIZE(comp_file_suffix);
s->comp_filename = test_malloc(comp_filename_size);
if (!s->raw_filename || !s->comp_filename) {
@@ -67,7 +67,7 @@ static int setup_ulzman_file(void **state)
snprintf(s->raw_filename, raw_filename_size, path_prefix, fname_base, raw_file_suffix);
snprintf(s->comp_filename, comp_filename_size, path_prefix, fname_base,
comp_file_suffix);
comp_file_suffix);
s->raw_file_sz = get_file_size(s->raw_filename);
s->comp_file_sz = get_file_size(s->comp_filename);
@@ -117,10 +117,10 @@ static void test_ulzman_correct_file(void **state)
assert_non_null(comp_buf);
assert_int_equal(s->raw_file_sz, read_file(s->raw_filename, raw_buf, s->raw_file_sz));
assert_int_equal(s->comp_file_sz,
read_file(s->comp_filename, comp_buf, s->comp_file_sz));
read_file(s->comp_filename, comp_buf, s->comp_file_sz));
assert_int_equal(s->raw_file_sz,
ulzman(comp_buf, s->comp_file_sz, decomp_buf, s->raw_file_sz));
ulzman(comp_buf, s->comp_file_sz, decomp_buf, s->raw_file_sz));
assert_memory_equal(raw_buf, decomp_buf, s->raw_file_sz);
test_free(raw_buf);
@@ -130,7 +130,7 @@ static void test_ulzman_correct_file(void **state)
static void test_ulzman_input_too_small(void **state)
{
uint8_t in_buf[32];
uint8_t in_buf[32] = {0};
uint8_t out_buf[32];
assert_int_equal(0, ulzman(in_buf, LZMA_PROPERTIES_SIZE, out_buf, sizeof(out_buf)));
@@ -148,13 +148,11 @@ static void test_ulzman_zero_buffer(void **state)
}
#define ULZMAN_CORRECT_FILE_TEST(_file_prefix) \
{ \
.name = "test_ulzman_correct_file(" _file_prefix ")", \
.test_func = test_ulzman_correct_file, \
.setup_func = setup_ulzman_file, \
.teardown_func = teardown_ulzman_file, \
.initial_state = (_file_prefix) \
}
{ \
.name = "test_ulzman_correct_file(" _file_prefix ")", \
.test_func = test_ulzman_correct_file, .setup_func = setup_ulzman_file, \
.teardown_func = teardown_ulzman_file, .initial_state = (_file_prefix) \
}
int main(void)
{