Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55295 )
Change subject: tests: Do not run a test if its driver is not built ......................................................................
tests: Do not run a test if its driver is not built
For all tests that exist as of today, drivers are built by default, however config options can be disabled and in that case test should not be run.
Technically, this is done by skipping the test.
BUG=b:181803212 TEST=1) Tested by adding into tests/meson.build -DCONFIG_xxx=0 4 times (for every driver with test), and then running ninja test Result: corresponding test is skipped, all other tests are passed
2) Running ninja test with default config settings (everything is enabled, no overriding in test meson). Result: all tests are passed.
3) Replacing one of config options in the patch with CONFIG_JLINK_SPI which is disabled by default. Result: corresponding test is skipped.
Change-Id: Ic1c48e41f658045a608f46636071f478ba646f77 Signed-off-by: Anastasia Klimchuk aklm@chromium.org Reviewed-on: https://review.coreboot.org/c/flashrom/+/55295 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Edward O'Callaghan quasisec@chromium.org --- M tests/init_shutdown.c 1 file changed, 16 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 80440bd..48448f8 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -34,7 +34,11 @@
void dummy_init_and_shutdown_test_success(void **state) { +#if CONFIG_DUMMY == 1 run_lifecycle(state, &programmer_dummy, "bus=parallel+lpc+fwh+spi"); +#else + skip(); +#endif }
struct mec1308_io_state { @@ -62,6 +66,7 @@
void mec1308_init_and_shutdown_test_success(void **state) { +#if CONFIG_MEC1308 == 1 struct mec1308_io_state mec1308_io_state = { 0 }; const struct io_mock mec1308_io = { .state = &mec1308_io_state, @@ -75,6 +80,9 @@ run_lifecycle(state, &programmer_mec1308, "");
io_mock_register(NULL); +#else + skip(); +#endif }
struct ene_lpc_io_state { @@ -118,6 +126,7 @@
void ene_lpc_init_and_shutdown_test_success(void **state) { +#if CONFIG_ENE_LPC == 1 /* * Current implementation tests for chip ENE_KB932. * Another chip which is not tested here is ENE_KB94X. @@ -134,6 +143,9 @@ run_lifecycle(state, &programmer_ene_lpc, "");
io_mock_register(NULL); +#else + skip(); +#endif }
void linux_spi_init_and_shutdown_test_success(void **state) @@ -144,5 +156,9 @@ * and the fallback to getpagesize(). This test does the latter (fallback to * getpagesize). */ +#if CONFIG_LINUX_SPI == 1 run_lifecycle(state, &programmer_linux_spi, "dev=/dev/null"); +#else + skip(); +#endif }