Merge 4.16
Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
@@ -116,7 +116,7 @@ static void test_memcpy_buffer_part(void **state)
|
||||
assert_memory_equal(s->buffer_to, s->helper_buffer, offset);
|
||||
assert_memory_equal(s->buffer_to + offset, s->buffer_from, sz);
|
||||
assert_memory_equal(s->buffer_to + offset + sz, s->helper_buffer + offset + sz,
|
||||
MEMCPY_BUFFER_SZ - (offset + sz));
|
||||
MEMCPY_BUFFER_SZ - (offset + sz));
|
||||
}
|
||||
|
||||
static void test_memcpy_buffer_part_unaligned(void **state)
|
||||
@@ -138,7 +138,7 @@ static void test_memcpy_buffer_part_unaligned(void **state)
|
||||
assert_memory_equal(s->buffer_to, s->helper_buffer, dst_offset);
|
||||
assert_memory_equal(s->buffer_to + dst_offset, s->buffer_from + src_offset, sz);
|
||||
assert_memory_equal(s->buffer_to + dst_offset + sz, s->helper_buffer + dst_offset + sz,
|
||||
MEMCPY_BUFFER_SZ - (dst_offset + sz));
|
||||
MEMCPY_BUFFER_SZ - (dst_offset + sz));
|
||||
}
|
||||
|
||||
static void test_memcpy_copy_to_itself(void **state)
|
||||
@@ -178,16 +178,16 @@ static void test_memcpy_copy_part_of_itself_to_itself(void **state)
|
||||
int main(void)
|
||||
{
|
||||
const struct CMUnitTest tests[] = {
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_full_buffer_copy,
|
||||
setup_test, teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_zero_size,
|
||||
setup_test, teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_buffer_part,
|
||||
setup_test, teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_buffer_part_unaligned,
|
||||
setup_test, teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_copy_to_itself,
|
||||
setup_test, teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_full_buffer_copy, setup_test,
|
||||
teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_zero_size, setup_test,
|
||||
teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_buffer_part, setup_test,
|
||||
teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_buffer_part_unaligned, setup_test,
|
||||
teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_copy_to_itself, setup_test,
|
||||
teardown_test),
|
||||
cmocka_unit_test_setup_teardown(test_memcpy_copy_part_of_itself_to_itself,
|
||||
setup_test, teardown_test),
|
||||
};
|
||||
|
Reference in New Issue
Block a user