For running the tests:
$ ./tools/testing/kunit/kunit.py run \ --arch=x86_64 \ --kconfig_add CONFIG_KPROBES=y \ --kconfig_add CONFIG_KUNIT_KPROBES_STUBS=y \ --kconfig_add CONFIG_CHROME_PLATFORMS=y \ --kconfig_add CONFIG_CROS_EC=y \ --kconfig_add CONFIG_SPI=y \ --kconfig_add CONFIG_CROS_EC_SPI=y \ --kconfig_add CONFIG_CROS_KUNIT_EC_SPI_TEST=y \ cros_ec_spi*
Signed-off-by: Tzung-Bi Shih tzungbi@kernel.org --- drivers/platform/chrome/Kconfig | 2 +- drivers/platform/chrome/cros_ec_spi_test.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig index aa13e871a31f..aacce3323384 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -339,7 +339,7 @@ config CROS_KUNIT_EC_SPI_TEST tristate "Kunit tests for ChromeOS EC over SPI" if !KUNIT_ALL_TESTS depends on KUNIT && CROS_EC default KUNIT_ALL_TESTS - depends on KUNIT_FTRACE_STUBS + depends on KUNIT_KPROBES_STUBS depends on CROS_EC_SPI help Kunit tests for ChromeOS EC over SPI. diff --git a/drivers/platform/chrome/cros_ec_spi_test.c b/drivers/platform/chrome/cros_ec_spi_test.c index 52dea75ecabf..74fcbd37b87b 100644 --- a/drivers/platform/chrome/cros_ec_spi_test.c +++ b/drivers/platform/chrome/cros_ec_spi_test.c @@ -3,7 +3,7 @@ * Kunit tests for ChromeOS Embedded Controller SPI interface. */ #include <kunit/test.h> -#include <kunit/ftrace_stub.h> +#include <kunit/kprobes_stub.h>
#include <linux/platform_data/cros_ec_commands.h> #include <linux/platform_data/cros_ec_proto.h> @@ -121,8 +121,8 @@ static int cros_ec_spi_test_init(struct kunit *test) int ret; struct device_driver *drv;
- kunit_activate_ftrace_stub(test, cros_ec_register, fake_cros_ec_register); - kunit_activate_ftrace_stub(test, cros_ec_unregister, fake_cros_ec_unregister); + kunit_activate_kprobes_stub(test, cros_ec_register, fake_cros_ec_register); + kunit_activate_kprobes_stub(test, cros_ec_unregister, fake_cros_ec_unregister);
priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); KUNIT_ASSERT_NOT_NULL(test, priv); @@ -181,8 +181,8 @@ static void cros_ec_spi_test_exit(struct kunit *test) device_del(&priv->dev); class_destroy(priv->fake_class);
- kunit_deactivate_ftrace_stub(test, cros_ec_register); - kunit_deactivate_ftrace_stub(test, cros_ec_unregister); + kunit_deactivate_kprobes_stub(test, cros_ec_register); + kunit_deactivate_kprobes_stub(test, cros_ec_unregister); }
static int cros_ec_spi_test_cmd_xfer_init(struct kunit *test)