diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/chip.c | 4 | ||||
| -rw-r--r-- | tests/io_mock.c | 2 | ||||
| -rw-r--r-- | tests/io_mock.h | 18 | ||||
| -rw-r--r-- | tests/linux_mtd.c | 6 | ||||
| -rw-r--r-- | tests/linux_spi.c | 4 | ||||
| -rw-r--r-- | tests/parade_lspcon.c | 6 | ||||
| -rw-r--r-- | tests/realtek_mst_i2c_spi.c | 6 | ||||
| -rw-r--r-- | tests/tests.c | 40 |
8 files changed, 43 insertions, 43 deletions
diff --git a/tests/chip.c b/tests/chip.c index 79d0c87a9..8f4771a1d 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -434,7 +434,7 @@ void verify_chip_test_success(void **state) .paths = { NULL }, }; const struct io_mock verify_chip_io = { - .fread = verify_chip_fread, + .iom_fread = verify_chip_fread, .fallback_open_state = &data, }; @@ -471,7 +471,7 @@ void verify_chip_with_dummyflasher_test_success(void **state) .paths = { NULL }, }; const struct io_mock verify_chip_io = { - .fread = verify_chip_fread, + .iom_fread = verify_chip_fread, .fallback_open_state = &data, }; diff --git a/tests/io_mock.c b/tests/io_mock.c index 9f86fcd67..c04e9c5a9 100644 --- a/tests/io_mock.c +++ b/tests/io_mock.c @@ -22,7 +22,7 @@ static const struct io_mock *current_io = NULL; void io_mock_register(const struct io_mock *io) { /* A test can either register its own mock open function or fallback_open_state. */ - assert_true(io == NULL || io->open == NULL || io->fallback_open_state == NULL); + assert_true(io == NULL || io->iom_open == NULL || io->fallback_open_state == NULL); current_io = io; } diff --git a/tests/io_mock.h b/tests/io_mock.h index 9e92a9d3e..644da74a2 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -101,17 +101,17 @@ struct io_mock { void (*libusb_free_config_descriptor)(void *state, struct libusb_config_descriptor *); /* POSIX File I/O */ - int (*open)(void *state, const char *pathname, int flags); - int (*ioctl)(void *state, int fd, unsigned long request, va_list args); - int (*read)(void *state, int fd, void *buf, size_t sz); - int (*write)(void *state, int fd, const void *buf, size_t sz); + int (*iom_open)(void *state, const char *pathname, int flags); + int (*iom_ioctl)(void *state, int fd, unsigned long request, va_list args); + int (*iom_read)(void *state, int fd, void *buf, size_t sz); + int (*iom_write)(void *state, int fd, const void *buf, size_t sz); /* Standard I/O */ - FILE* (*fopen)(void *state, const char *pathname, const char *mode); - char* (*fgets)(void *state, char *buf, int len, FILE *fp); - size_t (*fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); - int (*fprintf)(void *state, FILE *fp, const char *fmt, va_list args); - int (*fclose)(void *state, FILE *fp); + FILE* (*iom_fopen)(void *state, const char *pathname, const char *mode); + char* (*iom_fgets)(void *state, char *buf, int len, FILE *fp); + size_t (*iom_fread)(void *state, void *buf, size_t size, size_t len, FILE *fp); + int (*iom_fprintf)(void *state, FILE *fp, const char *fmt, va_list args); + int (*iom_fclose)(void *state, FILE *fp); /* * An alternative to custom open mock. A test can either register its diff --git a/tests/linux_mtd.c b/tests/linux_mtd.c index 10ccb5eb8..3aaa5abda 100644 --- a/tests/linux_mtd.c +++ b/tests/linux_mtd.c @@ -81,9 +81,9 @@ void linux_mtd_probe_lifecycle_test_success(void **state) }; const struct io_mock linux_mtd_io = { .state = &linux_mtd_io_state, - .fopen = linux_mtd_fopen, - .fread = linux_mtd_fread, - .fclose = linux_mtd_fclose, + .iom_fopen = linux_mtd_fopen, + .iom_fread = linux_mtd_fread, + .iom_fclose = linux_mtd_fclose, .fallback_open_state = &linux_mtd_fallback_open_state, }; diff --git a/tests/linux_spi.c b/tests/linux_spi.c index 2e3dc95f4..10096345f 100644 --- a/tests/linux_spi.c +++ b/tests/linux_spi.c @@ -60,8 +60,8 @@ void linux_spi_probe_lifecycle_test_success(void **state) .flags = { O_RDWR }, }; const struct io_mock linux_spi_io = { - .fgets = linux_spi_fgets, - .ioctl = linux_spi_ioctl, + .iom_fgets = linux_spi_fgets, + .iom_ioctl = linux_spi_ioctl, .fallback_open_state = &linux_spi_fallback_open_state, }; diff --git a/tests/parade_lspcon.c b/tests/parade_lspcon.c index 9d7bd2305..980e1280d 100644 --- a/tests/parade_lspcon.c +++ b/tests/parade_lspcon.c @@ -108,9 +108,9 @@ void parade_lspcon_basic_lifecycle_test_success(void **state) }; const struct io_mock parade_lspcon_io = { .state = ¶de_lspcon_io_state, - .ioctl = parade_lspcon_ioctl, - .read = parade_lspcon_read, - .write = parade_lspcon_write, + .iom_ioctl = parade_lspcon_ioctl, + .iom_read = parade_lspcon_read, + .iom_write = parade_lspcon_write, .fallback_open_state = ¶de_lspcon_fallback_open_state, }; diff --git a/tests/realtek_mst_i2c_spi.c b/tests/realtek_mst_i2c_spi.c index 0526124df..753f06b91 100644 --- a/tests/realtek_mst_i2c_spi.c +++ b/tests/realtek_mst_i2c_spi.c @@ -50,9 +50,9 @@ void realtek_mst_basic_lifecycle_test_success(void **state) .flags = { O_RDWR }, }; const struct io_mock realtek_mst_io = { - .ioctl = realtek_mst_ioctl, - .read = realtek_mst_read, - .write = realtek_mst_write, + .iom_ioctl = realtek_mst_ioctl, + .iom_read = realtek_mst_read, + .iom_write = realtek_mst_write, .fallback_open_state = &realtek_mst_fallback_open_state, }; diff --git a/tests/tests.c b/tests/tests.c index 77cb1effd..ea416b835 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -77,8 +77,8 @@ uint8_t __wrap_sio_read(uint16_t port, uint8_t reg) static int mock_open(const char *pathname, int flags) { - if (get_io() && get_io()->open) - return get_io()->open(get_io()->state, pathname, flags); + if (get_io() && get_io()->iom_open) + return get_io()->iom_open(get_io()->state, pathname, flags); if (get_io() && get_io()->fallback_open_state) { struct io_mock_fallback_open_state *io_state; @@ -117,11 +117,11 @@ int __wrap___open64_2(const char *pathname, int flags) int __wrap_ioctl(int fd, unsigned long int request, ...) { LOG_ME; - if (get_io() && get_io()->ioctl) { + if (get_io() && get_io()->iom_ioctl) { va_list args; int out; va_start(args, request); - out = get_io()->ioctl(get_io()->state, fd, request, args); + out = get_io()->iom_ioctl(get_io()->state, fd, request, args); va_end(args); return out; } @@ -131,32 +131,32 @@ int __wrap_ioctl(int fd, unsigned long int request, ...) int __wrap_write(int fd, const void *buf, size_t sz) { LOG_ME; - if (get_io() && get_io()->write) - return get_io()->write(get_io()->state, fd, buf, sz); + if (get_io() && get_io()->iom_write) + return get_io()->iom_write(get_io()->state, fd, buf, sz); return sz; } int __wrap_read(int fd, void *buf, size_t sz) { LOG_ME; - if (get_io() && get_io()->read) - return get_io()->read(get_io()->state, fd, buf, sz); + if (get_io() && get_io()->iom_read) + return get_io()->iom_read(get_io()->state, fd, buf, sz); return sz; } FILE *__wrap_fopen(const char *pathname, const char *mode) { LOG_ME; - if (get_io() && get_io()->fopen) - return get_io()->fopen(get_io()->state, pathname, mode); + if (get_io() && get_io()->iom_fopen) + return get_io()->iom_fopen(get_io()->state, pathname, mode); return not_null(); } FILE *__wrap_fopen64(const char *pathname, const char *mode) { LOG_ME; - if (get_io() && get_io()->fopen) - return get_io()->fopen(get_io()->state, pathname, mode); + if (get_io() && get_io()->iom_fopen) + return get_io()->iom_fopen(get_io()->state, pathname, mode); return not_null(); } @@ -217,16 +217,16 @@ int __wrap___fxstat64(int fd, void *buf) char *__wrap_fgets(char *buf, int len, FILE *fp) { LOG_ME; - if (get_io() && get_io()->fgets) - return get_io()->fgets(get_io()->state, buf, len, fp); + if (get_io() && get_io()->iom_fgets) + return get_io()->iom_fgets(get_io()->state, buf, len, fp); return NULL; } size_t __wrap_fread(void *ptr, size_t size, size_t nmemb, FILE *fp) { LOG_ME; - if (get_io() && get_io()->fread) - return get_io()->fread(get_io()->state, ptr, size, nmemb, fp); + if (get_io() && get_io()->iom_fread) + return get_io()->iom_fread(get_io()->state, ptr, size, nmemb, fp); return nmemb; } @@ -263,11 +263,11 @@ int __wrap_setvbuf(FILE *fp, char *buf, int type, size_t size) int __wrap_fprintf(FILE *fp, const char *fmt, ...) { LOG_ME; - if (get_io() && get_io()->fprintf) { + if (get_io() && get_io()->iom_fprintf) { va_list args; int out; va_start(args, fmt); - out = get_io()->fprintf(get_io()->state, fp, fmt, args); + out = get_io()->iom_fprintf(get_io()->state, fp, fmt, args); va_end(args); return out; } @@ -277,8 +277,8 @@ int __wrap_fprintf(FILE *fp, const char *fmt, ...) int __wrap_fclose(FILE *fp) { LOG_ME; - if (get_io() && get_io()->fclose) - return get_io()->fclose(get_io()->state, fp); + if (get_io() && get_io()->iom_fclose) + return get_io()->iom_fclose(get_io()->state, fp); return 0; } |