diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/chip.c | 10 | ||||
| -rw-r--r-- | tests/chip_wp.c | 2 | ||||
| -rw-r--r-- | tests/spi25.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/tests/chip.c b/tests/chip.c index 6f0317264..284b7e400 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -146,12 +146,14 @@ static void teardown(struct flashrom_layout **layout) io_mock_register(NULL); } +extern write_func_t *g_test_write_injector; + static const struct flashchip chip_8MiB = { .vendor = "aklm", .total_size = MOCK_CHIP_SIZE / KiB, .tested = TEST_OK_PREW, .read = read_chip, - .write = write_chip, + .write = TEST_WRITE_INJECTOR, .unlock = unlock_chip, .block_erasers = {{ @@ -167,7 +169,7 @@ static const struct flashchip chip_W25Q128_V = { .total_size = 16 * 1024, .tested = TEST_OK_PREW, .read = spi_chip_read, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .unlock = spi_disable_blockprotect, .page_size = 256, .block_erasers = @@ -203,6 +205,7 @@ void erase_chip_test_success(void **state) .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -261,6 +264,7 @@ void read_chip_test_success(void **state) .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -332,6 +336,7 @@ void write_chip_test_success(void **state) .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; @@ -429,6 +434,7 @@ void verify_chip_test_success(void **state) .fallback_open_state = &data, }; + g_test_write_injector = write_chip; struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; diff --git a/tests/chip_wp.c b/tests/chip_wp.c index e4eff9907..3c9be4099 100644 --- a/tests/chip_wp.c +++ b/tests/chip_wp.c @@ -65,7 +65,7 @@ static const struct flashchip chip_W25Q128_V = { .total_size = 16 * 1024, .tested = TEST_OK_PREW, .read = spi_chip_read, - .write = spi_chip_write_256, + .write = SPI_CHIP_WRITE256, .unlock = spi_disable_blockprotect, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_WRSR_EXT2 | FEATURE_WRSR2 | FEATURE_WRSR3, .block_erasers = diff --git a/tests/spi25.c b/tests/spi25.c index 5cd84fb85..872959341 100644 --- a/tests/spi25.c +++ b/tests/spi25.c @@ -32,7 +32,7 @@ struct flashchip mock_chip = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = PROBE_SPI_RDID, - .write = NULL, + .write = NO_WRITE_FUNC, }; /* |