mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
test: Use a local variable for test state
At present we use a global test state for all driver-model tests. Make use of a local struct like we do with the other tests. To make this work, add functions to get and set this state. When a test starts, the state is set (so it can be used in the test). When a test finishes, the state is unset, so it cannot be used by mistake. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
d2281bb09b
commit
fe806861a9
|
@ -367,6 +367,20 @@ void ut_unsilence_console(struct unit_test_state *uts);
|
||||||
*/
|
*/
|
||||||
void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays);
|
void ut_set_skip_delays(struct unit_test_state *uts, bool skip_delays);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* test_get_state() - Get the active test state
|
||||||
|
*
|
||||||
|
* @return the currently active test state, or NULL if none
|
||||||
|
*/
|
||||||
|
struct unit_test_state *test_get_state(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* test_set_state() - Set the active test state
|
||||||
|
*
|
||||||
|
* @uts: Test state to use as currently active test state, or NULL if none
|
||||||
|
*/
|
||||||
|
void test_set_state(struct unit_test_state *uts);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ut_run_test_live_flat() - Run a test with both live and flat tree
|
* ut_run_test_live_flat() - Run a test with both live and flat tree
|
||||||
*
|
*
|
||||||
|
|
|
@ -20,8 +20,6 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
struct unit_test_state global_dm_test_state;
|
|
||||||
|
|
||||||
static bool test_matches(const char *test_name, const char *find_name)
|
static bool test_matches(const char *test_name, const char *find_name)
|
||||||
{
|
{
|
||||||
if (!find_name)
|
if (!find_name)
|
||||||
|
@ -44,7 +42,7 @@ int dm_test_run(const char *test_name)
|
||||||
{
|
{
|
||||||
struct unit_test *tests = ll_entry_start(struct unit_test, dm_test);
|
struct unit_test *tests = ll_entry_start(struct unit_test, dm_test);
|
||||||
const int n_ents = ll_entry_count(struct unit_test, dm_test);
|
const int n_ents = ll_entry_count(struct unit_test, dm_test);
|
||||||
struct unit_test_state *uts = &global_dm_test_state;
|
struct unit_test_state uts_s = { .fail_count = 0 }, *uts = &uts_s;
|
||||||
struct unit_test *test;
|
struct unit_test *test;
|
||||||
int found;
|
int found;
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
#include <test/ut.h>
|
#include <test/ut.h>
|
||||||
|
|
||||||
int dm_testdrv_op_count[DM_TEST_OP_COUNT];
|
int dm_testdrv_op_count[DM_TEST_OP_COUNT];
|
||||||
static struct unit_test_state *uts = &global_dm_test_state;
|
|
||||||
|
|
||||||
static int testdrv_ping(struct udevice *dev, int pingval, int *pingret)
|
static int testdrv_ping(struct udevice *dev, int pingval, int *pingret)
|
||||||
{
|
{
|
||||||
|
@ -37,6 +36,8 @@ static const struct test_ops test_ops = {
|
||||||
|
|
||||||
static int test_bind(struct udevice *dev)
|
static int test_bind(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
|
|
||||||
/* Private data should not be allocated */
|
/* Private data should not be allocated */
|
||||||
ut_assert(!dev_get_priv(dev));
|
ut_assert(!dev_get_priv(dev));
|
||||||
|
|
||||||
|
@ -46,6 +47,7 @@ static int test_bind(struct udevice *dev)
|
||||||
|
|
||||||
static int test_probe(struct udevice *dev)
|
static int test_probe(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
struct dm_test_priv *priv = dev_get_priv(dev);
|
struct dm_test_priv *priv = dev_get_priv(dev);
|
||||||
|
|
||||||
/* Private data should be allocated */
|
/* Private data should be allocated */
|
||||||
|
@ -58,6 +60,8 @@ static int test_probe(struct udevice *dev)
|
||||||
|
|
||||||
static int test_remove(struct udevice *dev)
|
static int test_remove(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
|
|
||||||
/* Private data should still be allocated */
|
/* Private data should still be allocated */
|
||||||
ut_assert(dev_get_priv(dev));
|
ut_assert(dev_get_priv(dev));
|
||||||
|
|
||||||
|
@ -67,6 +71,8 @@ static int test_remove(struct udevice *dev)
|
||||||
|
|
||||||
static int test_unbind(struct udevice *dev)
|
static int test_unbind(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
|
|
||||||
/* Private data should not be allocated */
|
/* Private data should not be allocated */
|
||||||
ut_assert(!dev_get_priv(dev));
|
ut_assert(!dev_get_priv(dev));
|
||||||
|
|
||||||
|
@ -116,6 +122,8 @@ static int test_manual_bind(struct udevice *dev)
|
||||||
|
|
||||||
static int test_manual_probe(struct udevice *dev)
|
static int test_manual_probe(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
|
|
||||||
dm_testdrv_op_count[DM_TEST_OP_PROBE]++;
|
dm_testdrv_op_count[DM_TEST_OP_PROBE]++;
|
||||||
if (!uts->force_fail_alloc)
|
if (!uts->force_fail_alloc)
|
||||||
dev_set_priv(dev, calloc(1, sizeof(struct dm_test_priv)));
|
dev_set_priv(dev, calloc(1, sizeof(struct dm_test_priv)));
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
#include <test/test.h>
|
#include <test/test.h>
|
||||||
#include <test/ut.h>
|
#include <test/ut.h>
|
||||||
|
|
||||||
static struct unit_test_state *uts = &global_dm_test_state;
|
|
||||||
|
|
||||||
int test_ping(struct udevice *dev, int pingval, int *pingret)
|
int test_ping(struct udevice *dev, int pingval, int *pingret)
|
||||||
{
|
{
|
||||||
const struct test_ops *ops = device_get_ops(dev);
|
const struct test_ops *ops = device_get_ops(dev);
|
||||||
|
@ -31,6 +29,7 @@ int test_ping(struct udevice *dev, int pingval, int *pingret)
|
||||||
|
|
||||||
static int test_post_bind(struct udevice *dev)
|
static int test_post_bind(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
struct dm_test_perdev_uc_pdata *uc_pdata;
|
struct dm_test_perdev_uc_pdata *uc_pdata;
|
||||||
|
|
||||||
dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++;
|
dm_testdrv_op_count[DM_TEST_OP_POST_BIND]++;
|
||||||
|
@ -56,6 +55,7 @@ static int test_pre_unbind(struct udevice *dev)
|
||||||
static int test_pre_probe(struct udevice *dev)
|
static int test_pre_probe(struct udevice *dev)
|
||||||
{
|
{
|
||||||
struct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev);
|
struct dm_test_uclass_perdev_priv *priv = dev_get_uclass_priv(dev);
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
|
|
||||||
dm_testdrv_op_count[DM_TEST_OP_PRE_PROBE]++;
|
dm_testdrv_op_count[DM_TEST_OP_PRE_PROBE]++;
|
||||||
ut_assert(priv);
|
ut_assert(priv);
|
||||||
|
@ -66,6 +66,7 @@ static int test_pre_probe(struct udevice *dev)
|
||||||
|
|
||||||
static int test_post_probe(struct udevice *dev)
|
static int test_post_probe(struct udevice *dev)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
struct udevice *prev = list_entry(dev->uclass_node.prev,
|
struct udevice *prev = list_entry(dev->uclass_node.prev,
|
||||||
struct udevice, uclass_node);
|
struct udevice, uclass_node);
|
||||||
|
|
||||||
|
@ -100,6 +101,8 @@ static int test_pre_remove(struct udevice *dev)
|
||||||
|
|
||||||
static int test_init(struct uclass *uc)
|
static int test_init(struct uclass *uc)
|
||||||
{
|
{
|
||||||
|
struct unit_test_state *uts = test_get_state();
|
||||||
|
|
||||||
dm_testdrv_op_count[DM_TEST_OP_INIT]++;
|
dm_testdrv_op_count[DM_TEST_OP_INIT]++;
|
||||||
ut_assert(uclass_get_priv(uc));
|
ut_assert(uclass_get_priv(uc));
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,19 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
/* This is valid when a test is running, NULL otherwise */
|
||||||
|
static struct unit_test_state *cur_test_state;
|
||||||
|
|
||||||
|
struct unit_test_state *test_get_state(void)
|
||||||
|
{
|
||||||
|
return cur_test_state;
|
||||||
|
}
|
||||||
|
|
||||||
|
void test_set_state(struct unit_test_state *uts)
|
||||||
|
{
|
||||||
|
cur_test_state = uts;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* dm_test_pre_run() - Get ready to run a driver model test
|
* dm_test_pre_run() - Get ready to run a driver model test
|
||||||
*
|
*
|
||||||
|
@ -180,6 +193,9 @@ static int ut_run_test(struct unit_test_state *uts, struct unit_test *test,
|
||||||
note = " (flat tree)";
|
note = " (flat tree)";
|
||||||
printf("Test: %s: %s%s\n", test_name, fname, note);
|
printf("Test: %s: %s%s\n", test_name, fname, note);
|
||||||
|
|
||||||
|
/* Allow access to test state from drivers */
|
||||||
|
test_set_state(uts);
|
||||||
|
|
||||||
ret = test_pre_run(uts, test);
|
ret = test_pre_run(uts, test);
|
||||||
if (ret == -EAGAIN)
|
if (ret == -EAGAIN)
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
|
@ -192,6 +208,8 @@ static int ut_run_test(struct unit_test_state *uts, struct unit_test *test,
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
test_set_state( NULL);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user