Nico Huber submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve
tests: Add unit test to run init/shutdown for linux_spi.c

The current implementation tests a particular path of the init
procedure. There are two ways for it to succeed: reading the buffer
size from sysfs and the fallback to getpagesize(). This test does
the latter (fallback to getpagesize).

Extract from meson-logs/testlog.txt for new test:

[ RUN ] linux_spi_init_and_shutdown_test_success
Testing programmer_init for programmer=25 ...
__wrap_open64 is called
__wrap_ioctl is called
__wrap_ioctl is called
__wrap_ioctl is called
__wrap_fopen64 is called
... programmer_init for programmer=25 successful
Testing programmer_shutdown for programmer=25 ...
... programmer_shutdown for programmer=25 successful
[ OK ] linux_spi_init_and_shutdown_test_success

BUG=b:181803212
TEST=builds and ninja test

Change-Id: I4911fbb6f04371283f0e62d2196bdd691a227584
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52498
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M tests/init_shutdown.c
M tests/meson.build
M tests/tests.c
M tests/tests.h
4 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c
index 5226860..abaaf68 100644
--- a/tests/init_shutdown.c
+++ b/tests/init_shutdown.c
@@ -35,3 +35,14 @@
{
run_lifecycle(state, PROGRAMMER_DUMMY, "bus=parallel+lpc+fwh+spi");
}
+
+void linux_spi_init_and_shutdown_test_success(void **state)
+{
+ /*
+ * Current implementation tests a particular path of the init procedure.
+ * There are two ways for it to succeed: reading the buffer size from sysfs
+ * and the fallback to getpagesize(). This test does the latter (fallback to
+ * getpagesize).
+ */
+ run_lifecycle(state, PROGRAMMER_LINUX_SPI, "dev=/dev/null");
+}
diff --git a/tests/meson.build b/tests/meson.build
index 815ea76..b087f2c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -25,6 +25,13 @@
'-Wl,--wrap=physunmap',
'-Wl,--wrap=physmap',
'-Wl,--wrap=spi_send_command',
+ '-Wl,--wrap=sio_write',
+ '-Wl,--wrap=sio_read',
+ '-Wl,--wrap=open',
+ '-Wl,--wrap=open64',
+ '-Wl,--wrap=ioctl',
+ '-Wl,--wrap=fopen',
+ '-Wl,--wrap=fopen64',
'-Wl,--gc-sections',
]

diff --git a/tests/tests.c b/tests/tests.c
index 1dc819e..701770f 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -17,6 +17,7 @@
#include "tests.h"

#include <stdio.h>
+#include <stdint.h>

/* redefinitions/wrapping */
#define LOG_ME printf("%s is called\n", __func__)
@@ -32,6 +33,47 @@
return NULL;
}

+void __wrap_sio_write(uint16_t port, uint8_t reg, uint8_t data)
+{
+ LOG_ME;
+}
+
+uint8_t __wrap_sio_read(uint16_t port, uint8_t reg)
+{
+ LOG_ME;
+ return (uint8_t)mock();
+}
+
+int __wrap_open(const char *pathname, int flags)
+{
+ LOG_ME;
+ return 2021;
+}
+
+int __wrap_open64(const char *pathname, int flags)
+{
+ LOG_ME;
+ return 2021;
+}
+
+int __wrap_ioctl(int fd, unsigned long int request, ...)
+{
+ LOG_ME;
+ return 2021;
+}
+
+FILE *__wrap_fopen(const char *pathname, const char *mode)
+{
+ LOG_ME;
+ return NULL;
+}
+
+FILE *__wrap_fopen64(const char *pathname, const char *mode)
+{
+ LOG_ME;
+ return NULL;
+}
+
int main(void)
{
int ret = 0;
@@ -70,6 +112,7 @@

const struct CMUnitTest init_shutdown_tests[] = {
cmocka_unit_test(dummy_init_and_shutdown_test_success),
+ cmocka_unit_test(linux_spi_init_and_shutdown_test_success),
};
ret |= cmocka_run_group_tests_name("init_shutdown.c tests", init_shutdown_tests, NULL, NULL);

diff --git a/tests/tests.h b/tests/tests.h
index 32fed0a..16476c2 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -42,5 +42,6 @@

/* init_shutdown.c */
void dummy_init_and_shutdown_test_success(void **state);
+void linux_spi_init_and_shutdown_test_success(void **state);

#endif /* TESTS_H */

To view, visit change 52498. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I4911fbb6f04371283f0e62d2196bdd691a227584
Gerrit-Change-Number: 52498
Gerrit-PatchSet: 7
Gerrit-Owner: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged