Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58357 )
Change subject: tests: Add tests to write on chip ......................................................................
tests: Add tests to write on chip
This patch adds two tests and initialises page_size in mock chip chip_W25Q128_V. page_size was not needed for previous tests (erase and read). page_size only needed to execute writing on chip with dummyflasher, so it is added here.
BUG=b:181803212 TEST=ninja test
Change-Id: I6f0336613ab16a7e59857006496e3590ddb14d00 Signed-off-by: Anastasia Klimchuk aklm@chromium.org Reviewed-on: https://review.coreboot.org/c/flashrom/+/58357 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org --- M tests/chip.c M tests/meson.build M tests/tests.c M tests/tests.h 4 files changed, 72 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
diff --git a/tests/chip.c b/tests/chip.c index 54e14d2..4181aed 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -148,6 +148,7 @@ .read = spi_chip_read, .write = spi_chip_write_256, .unlock = spi_disable_blockprotect, + .page_size = 256, .block_erasers = { { @@ -256,3 +257,63 @@
free(param_dup); } + +void write_chip_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_flashctx flash = { 0 }; + struct flashrom_layout *layout; + struct flashchip mock_chip = chip_8MiB; + const char *param = ""; /* Default values for all params. */ + + setup_chip(&flash, &layout, &mock_chip, param); + + /* + * Providing filename "-" means content is taken from standard input. + * This doesn't change much because all file operations are mocked. + * However filename "-" makes a difference for + * flashrom.c#read_buf_from_file and allows to avoid mocking + * image_stat.st_size. + * + * Now this does mean test covers successful path only, but this test + * is designed to cover only successful write operation anyway. + * + * To cover error path of image_stat.st_size != flash size, filename + * needs to be provided and image_stat.st_size needs to be mocked. + */ + const char *const filename = "-"; + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flash, filename, NULL)); + printf("Write chip operation done.\n"); + + teardown(&layout); +} + +void write_chip_with_dummyflasher_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_flashctx flash = { 0 }; + struct flashrom_layout *layout; + struct flashchip mock_chip = chip_W25Q128_V; + /* + * Dummyflasher is capable to emulate W25Q128.V, so we ask it to do this. + * Nothing to mock, dummy is taking care of this already. + */ + char *param_dup = strdup("bus=spi,emulate=W25Q128FV"); + + setup_chip(&flash, &layout, &mock_chip, param_dup); + + /* See comment in write_chip_test_success */ + const char *const filename = "-"; + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flash, filename, NULL)); + printf("Write chip operation done.\n"); + + teardown(&layout); + + free(param_dup); +} diff --git a/tests/meson.build b/tests/meson.build index 30b1e78..ebfbaef 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -41,6 +41,7 @@ '-Wl,--wrap=write', '-Wl,--wrap=fopen', '-Wl,--wrap=fopen64', + '-Wl,--wrap=fdopen', '-Wl,--wrap=fwrite', '-Wl,--wrap=fflush', '-Wl,--wrap=stat', diff --git a/tests/tests.c b/tests/tests.c index d3df356..e3ad241 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -136,6 +136,12 @@ return not_null(); }
+FILE *__wrap_fdopen(int fd, const char *mode) +{ + LOG_ME; + return not_null(); +} + int __wrap_stat(const char *path, void *buf) { LOG_ME; @@ -343,6 +349,8 @@ cmocka_unit_test(erase_chip_with_dummyflasher_test_success), cmocka_unit_test(read_chip_test_success), cmocka_unit_test(read_chip_with_dummyflasher_test_success), + cmocka_unit_test(write_chip_test_success), + cmocka_unit_test(write_chip_with_dummyflasher_test_success), }; ret |= cmocka_run_group_tests_name("chip.c tests", chip_tests, NULL, NULL);
diff --git a/tests/tests.h b/tests/tests.h index c142b45..732920a 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -61,5 +61,7 @@ void erase_chip_with_dummyflasher_test_success(void **state); void read_chip_test_success(void **state); void read_chip_with_dummyflasher_test_success(void **state); +void write_chip_test_success(void **state); +void write_chip_with_dummyflasher_test_success(void **state);
#endif /* TESTS_H */
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.