Commit 7c912288 authored by Daniel Leung's avatar Daniel Leung Committed by Fabio Baltieri
Browse files

ztest: rename shadow variables 



This renames the shadow variables found by -Wshadow.

Signed-off-by: default avatarDaniel Leung <daniel.leung@intel.com>
parent 6f6f7d6c

subsys/testsuite/busy_sim/busy_sim.c

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct busy_sim_data { 
	busy_sim_cb_t cb;

};



static struct k_work work;

static struct k_work sim_work;

static struct ring_buf rnd_rbuf;

static uint8_t rnd_buf[BUFFER_SIZE];
@@ -84,7 +84,7 @@ static uint32_t get_timeout(bool idle) 
				   (uint8_t *)&rand_val,

				   sizeof(rand_val));

		if (len < sizeof(rand_val)) {

			k_work_submit(&work);

			k_work_submit(&sim_work);

			rand_val = 0;

		}

	}
@@ -141,7 +141,7 @@ void busy_sim_start(uint32_t active_avg, uint32_t active_delta, 
	data->idle_delta = idle_delta;



	if (!IS_ENABLED(CONFIG_XOSHIRO_RANDOM_GENERATOR)) {

		err = k_work_submit(&work);

		err = k_work_submit(&sim_work);

		__ASSERT_NO_MSG(err >= 0);

	}
@@ -159,7 +159,7 @@ void busy_sim_stop(void) 
	const struct busy_sim_config *config = busy_sim_dev->config;



	if (!IS_ENABLED(CONFIG_XOSHIRO_RANDOM_GENERATOR)) {

		k_work_cancel(&work);

		k_work_cancel(&sim_work);

	}



	err = counter_stop(config->counter);
@@ -191,7 +191,7 @@ static int busy_sim_init(const struct device *dev) 
	}



	if (!IS_ENABLED(CONFIG_XOSHIRO_RANDOM_GENERATOR)) {

		k_work_init(&work, rng_pool_work_handler);

		k_work_init(&sim_work, rng_pool_work_handler);

		ring_buf_init(&rnd_rbuf, BUFFER_SIZE, rnd_buf);

	}

subsys/testsuite/ztest/include/zephyr/ztest_test_new.h

+3 −3
Original line number Diff line number Diff line
@@ -393,10 +393,10 @@ void ztest_skip_failed_assumption(void); 
		.thread_options = t_options,                                                       \

		.stats = &z_ztest_unit_test_stats_##suite##_##fn                                   \

	};                                                                                         \

	static void _##suite##_##fn##_wrapper(void *data)                                          \

	static void _##suite##_##fn##_wrapper(void *wrapper_data)                                  \

	{                                                                                          \

		COND_CODE_1(use_fixture, (suite##_##fn((struct suite##_fixture *)data);),          \

			    (ARG_UNUSED(data); suite##_##fn();))                                   \

		COND_CODE_1(use_fixture, (suite##_##fn((struct suite##_fixture *)wrapper_data);),  \

			    (ARG_UNUSED(wrapper_data); suite##_##fn();))                           \

	}                                                                                          \

	static inline void suite##_##fn(                                                           \

		COND_CODE_1(use_fixture, (struct suite##_fixture *fixture), (void)))

subsys/testsuite/ztest/include/zephyr/ztress.h

+8 −7
Original line number Diff line number Diff line
@@ -176,17 +176,18 @@ struct ztress_context_data { 
#define ZTRESS_EXECUTE(...) do {							\

	Z_ZTRESS_TIMER_CONTEXT_VALIDATE(__VA_ARGS__);					\

	int has_timer = Z_ZTRESS_HAS_TIMER(__VA_ARGS__);				\

	struct ztress_context_data data1[] = {						\

	struct ztress_context_data _ctx_data1[] = {					\

		FOR_EACH(Z_ZTRESS_GET_HANDLER_DATA, (,), __VA_ARGS__)			\

	};										\

	size_t cnt = ARRAY_SIZE(data1) - has_timer;					\

	static struct ztress_context_data data[ARRAY_SIZE(data1)];                      \

	for (size_t i = 0; i < ARRAY_SIZE(data1); i++) {                                \

		data[i] = data1[i];                                                     \

	size_t cnt = ARRAY_SIZE(_ctx_data1) - has_timer;				\

	static struct ztress_context_data _ctx_data[ARRAY_SIZE(_ctx_data1)];		\

	for (size_t i = 0; i < ARRAY_SIZE(_ctx_data1); i++) {				\

		_ctx_data[i] = _ctx_data1[i];						\

	}	                                                                        \

	int err = ztress_execute(has_timer ? &data[0] : NULL, &data[has_timer], cnt);	\

	int exec_err = ztress_execute(has_timer ? &_ctx_data[0] : NULL,			\

				 &_ctx_data[has_timer], cnt);				\

											\

	zassert_equal(err, 0, "ztress_execute failed (err: %d)", err);			\

	zassert_equal(exec_err, 0, "ztress_execute failed (err: %d)", exec_err);	\

} while (0)



/** Execute contexts.

subsys/testsuite/ztest/src/ztest_new.c

+23 −23
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ enum ztest_status { 
/**

 * @brief Tracks the current phase that ztest is operating in.

 */

ZTEST_DMEM enum ztest_phase phase = TEST_PHASE_FRAMEWORK;

ZTEST_DMEM enum ztest_phase cur_phase = TEST_PHASE_FRAMEWORK;



static ZTEST_BMEM enum ztest_status test_status = ZTEST_STATUS_OK;
@@ -303,43 +303,43 @@ static jmp_buf test_suite_fail; 


void ztest_test_fail(void)

{

	switch (phase) {

	switch (cur_phase) {

	case TEST_PHASE_SETUP:

		PRINT(" at %s function\n", get_friendly_phase_name(phase));

		PRINT(" at %s function\n", get_friendly_phase_name(cur_phase));

		longjmp(test_suite_fail, 1);

	case TEST_PHASE_BEFORE:

	case TEST_PHASE_TEST:

		PRINT(" at %s function\n", get_friendly_phase_name(phase));

		PRINT(" at %s function\n", get_friendly_phase_name(cur_phase));

		longjmp(test_fail, 1);

	case TEST_PHASE_AFTER:

	case TEST_PHASE_TEARDOWN:

	case TEST_PHASE_FRAMEWORK:

		PRINT(" ERROR: cannot fail in test phase '%s()', bailing\n",

		      get_friendly_phase_name(phase));

		      get_friendly_phase_name(cur_phase));

		longjmp(stack_fail, 1);

	}

}



void ztest_test_pass(void)

{

	if (phase == TEST_PHASE_TEST) {

	if (cur_phase == TEST_PHASE_TEST) {

		longjmp(test_pass, 1);

	}

	PRINT(" ERROR: cannot pass in test phase '%s()', bailing\n",

	      get_friendly_phase_name(phase));

	      get_friendly_phase_name(cur_phase));

	longjmp(stack_fail, 1);

}



void ztest_test_skip(void)

{

	switch (phase) {

	switch (cur_phase) {

	case TEST_PHASE_SETUP:

	case TEST_PHASE_BEFORE:

	case TEST_PHASE_TEST:

		longjmp(test_skip, 1);

	default:

		PRINT(" ERROR: cannot skip in test phase '%s()', bailing\n",

		      get_friendly_phase_name(phase));

		      get_friendly_phase_name(cur_phase));

		longjmp(stack_fail, 1);

	}

}
@@ -348,19 +348,19 @@ void ztest_test_expect_fail(void) 
{

	failed_expectation = true;



	switch (phase) {

	switch (cur_phase) {

	case TEST_PHASE_SETUP:

		PRINT(" at %s function\n", get_friendly_phase_name(phase));

		PRINT(" at %s function\n", get_friendly_phase_name(cur_phase));

		break;

	case TEST_PHASE_BEFORE:

	case TEST_PHASE_TEST:

		PRINT(" at %s function\n", get_friendly_phase_name(phase));

		PRINT(" at %s function\n", get_friendly_phase_name(cur_phase));

		break;

	case TEST_PHASE_AFTER:

	case TEST_PHASE_TEARDOWN:

	case TEST_PHASE_FRAMEWORK:

		PRINT(" ERROR: cannot fail in test phase '%s()', bailing\n",

		      get_friendly_phase_name(phase));

		      get_friendly_phase_name(cur_phase));

		longjmp(stack_fail, 1);

	}

}
@@ -445,7 +445,7 @@ static void test_finalize(void) 


void ztest_test_fail(void)

{

	switch (phase) {

	switch (cur_phase) {

	case TEST_PHASE_SETUP:

		__ztest_set_test_result(ZTEST_RESULT_SUITE_FAIL);

		break;
@@ -456,7 +456,7 @@ void ztest_test_fail(void) 
		break;

	default:

		PRINT(" ERROR: cannot fail in test phase '%s()', bailing\n",

		      get_friendly_phase_name(phase));

		      get_friendly_phase_name(cur_phase));

		test_status = ZTEST_STATUS_CRITICAL_ERROR;

		break;

	}
@@ -464,16 +464,16 @@ void ztest_test_fail(void) 


void ztest_test_pass(void)

{

	switch (phase) {

	switch (cur_phase) {

	case TEST_PHASE_TEST:

		__ztest_set_test_result(ZTEST_RESULT_PASS);

		test_finalize();

		break;

	default:

		PRINT(" ERROR: cannot pass in test phase '%s()', bailing\n",

		      get_friendly_phase_name(phase));

		      get_friendly_phase_name(cur_phase));

		test_status = ZTEST_STATUS_CRITICAL_ERROR;

		if (phase == TEST_PHASE_BEFORE) {

		if (cur_phase == TEST_PHASE_BEFORE) {

			test_finalize();

		}

	}
@@ -481,7 +481,7 @@ void ztest_test_pass(void) 


void ztest_test_skip(void)

{

	switch (phase) {

	switch (cur_phase) {

	case TEST_PHASE_SETUP:

		__ztest_set_test_result(ZTEST_RESULT_SUITE_SKIP);

		break;
@@ -492,7 +492,7 @@ void ztest_test_skip(void) 
		break;

	default:

		PRINT(" ERROR: cannot skip in test phase '%s()', bailing\n",

		      get_friendly_phase_name(phase));

		      get_friendly_phase_name(cur_phase));

		test_status = ZTEST_STATUS_CRITICAL_ERROR;

		break;

	}
@@ -717,8 +717,8 @@ static int z_ztest_run_test_suite_ptr(struct ztest_suite_node *suite) 
		memset(tests_to_run, 0, ZTEST_TEST_COUNT * sizeof(struct ztest_unit_test *));

		z_ztest_shuffle((void **)tests_to_run, (intptr_t)_ztest_unit_test_list_start,

				ZTEST_TEST_COUNT, sizeof(struct ztest_unit_test));

		for (size_t i = 0; i < ZTEST_TEST_COUNT; ++i) {

			test = tests_to_run[i];

		for (size_t j = 0; j < ZTEST_TEST_COUNT; ++j) {

			test = tests_to_run[j];

			/* Make sure that the test belongs to this suite */

			if (strcmp(suite->name, test->test_suite_name) != 0) {

				continue;
@@ -1008,7 +1008,7 @@ void z_impl___ztest_set_test_result(enum ztest_result new_result) 


void z_impl___ztest_set_test_phase(enum ztest_phase new_phase)

{

	phase = new_phase;

	cur_phase = new_phase;

}



#ifdef CONFIG_USERSPACE

CRA Git | Maintained and supported by SUSTech CRA and CCSE