From fe476cc036706c730862bdfb5983338ac401b341 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 1 Apr 2018 08:20:11 -0500 Subject: [PATCH] tests: ztest: test_main takes no arguments Some tests were using test_main with arguments causing conflicts during build. Signed-off-by: Anas Nashif --- tests/subsys/dfu/img_util/src/main.c | 5 +++-- tests/subsys/dfu/mcuboot/src/main.c | 2 +- tests/subsys/fs/fcb/src/main.c | 2 +- tests/subsys/settings/fcb/src/settings_test_fcb.c | 2 +- tests/subsys/settings/nffs/src/settings_test_nffs.c | 2 +- tests/subsys/storage/flash_map/src/main.c | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/subsys/dfu/img_util/src/main.c b/tests/subsys/dfu/img_util/src/main.c index a30d3be8c90..d73580794c5 100644 --- a/tests/subsys/dfu/img_util/src/main.c +++ b/tests/subsys/dfu/img_util/src/main.c @@ -46,8 +46,9 @@ void test_collecting(void) } } -void test_main(void *p1, void *p2, void *p3) +void test_main(void) { - ztest_test_suite(test_util, ztest_unit_test(test_collecting)); + ztest_test_suite(test_util, + ztest_unit_test(test_collecting)); ztest_run_test_suite(test_util); } diff --git a/tests/subsys/dfu/mcuboot/src/main.c b/tests/subsys/dfu/mcuboot/src/main.c index dd6e9e2bbef..5541de01a07 100644 --- a/tests/subsys/dfu/mcuboot/src/main.c +++ b/tests/subsys/dfu/mcuboot/src/main.c @@ -138,7 +138,7 @@ void test_write_confirm(void) zassert_equal(1, readout[0] & 0xff, "confirmation error"); } -void test_main(void *p1, void *p2, void *p3) +void test_main(void) { ztest_test_suite(test_mcuboot_interface, ztest_unit_test(test_bank_erase), diff --git a/tests/subsys/fs/fcb/src/main.c b/tests/subsys/fs/fcb/src/main.c index a6ade021548..c7ad82c7d3f 100644 --- a/tests/subsys/fs/fcb/src/main.c +++ b/tests/subsys/fs/fcb/src/main.c @@ -143,7 +143,7 @@ void fcb_test_rotate(void); void fcb_test_multi_scratch(void); void fcb_test_last_of_n(void); -void test_main(void *p1, void *p2, void *p3) +void test_main(void) { ztest_test_suite(test_fcb, ztest_unit_test_setup_teardown(fcb_test_len, diff --git a/tests/subsys/settings/fcb/src/settings_test_fcb.c b/tests/subsys/settings/fcb/src/settings_test_fcb.c index 404e34cd0b9..44a3a5884a9 100644 --- a/tests/subsys/settings/fcb/src/settings_test_fcb.c +++ b/tests/subsys/settings/fcb/src/settings_test_fcb.c @@ -325,7 +325,7 @@ void test_config_save_3_fcb(void); void test_config_compress_reset(void); void test_config_save_one_fcb(void); -void test_main(void *p1, void *p2, void *p3) +void test_main(void) { ztest_test_suite(test_config_fcb, /* Config tests */ diff --git a/tests/subsys/settings/nffs/src/settings_test_nffs.c b/tests/subsys/settings/nffs/src/settings_test_nffs.c index e2427cb8358..9a9dda50c16 100644 --- a/tests/subsys/settings/nffs/src/settings_test_nffs.c +++ b/tests/subsys/settings/nffs/src/settings_test_nffs.c @@ -208,7 +208,7 @@ void test_config_save_in_file(void); void test_config_save_one_file(void); void test_config_compress_file(void); -void test_main(void *p1, void *p2, void *p3) +void test_main(void) { ztest_test_suite(test_config_fcb, /* Config tests */ diff --git a/tests/subsys/storage/flash_map/src/main.c b/tests/subsys/storage/flash_map/src/main.c index ef7dff3ad69..51064c4a716 100644 --- a/tests/subsys/storage/flash_map/src/main.c +++ b/tests/subsys/storage/flash_map/src/main.c @@ -96,7 +96,7 @@ void flash_map_test_case_2(void) } -void test_main(void *p1, void *p2, void *p3) +void test_main(void) { ztest_test_suite(test_flash_map, ztest_unit_test(flash_map_test_case_2));