feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

unity: don't use stdio in runner, fix code style

Browse Source
This commit is contained in:
Ivan Grokhotkov
2018-10-25 15:44:50 +08:00
parent 6091021e83
commit a98674d78b
3 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/unity/include/unity_config.h
+3 -11
View File
@@ -40,19 +40,11 @@ uint32_t unity_exec_time_get_ms(void);
#define UNITY_EXEC_TIME_STOP() unity_exec_time_stop()
#define UNITY_EXEC_TIME_MS() unity_exec_time_get_ms()
#ifdef CONFIG_UNITY_ENABLE_TEST_RUNNER
#ifdef CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER
#include "unity_test_case.h"
#include "unity_test_runner.h"
void unity_run_menu() __attribute__((noreturn));
void unity_run_tests_with_filter(const char* filter);
void unity_run_all_tests();
void unity_run_single_test_by_name(const char* name);
#endif //CONFIG_UNITY_ENABLE_TEST_RUNNER
#endif //CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER
// shorthand to check esp_err_t return code
#define TEST_ESP_OK(rc) TEST_ASSERT_EQUAL_HEX32(ESP_OK, rc)
components/unity/include/unity_test_case.h → components/unity/include/unity_test_runner.h
+16 -6
View File
@@ -14,6 +14,7 @@
#pragma once
#include <stdint.h>
#include <stdbool.h>
// This file gets included from unity.h via unity_internals.h via unity_config.h
// It is inside #ifdef __cplusplus / extern "C" block, so we can
@@ -54,7 +55,7 @@
typedef void (* test_func)(void);
struct test_desc_t
typedef struct test_desc_t
{
const char* name;
const char* desc;
@@ -64,9 +65,9 @@ struct test_desc_t
uint8_t test_fn_count;
const char ** test_fn_name;
struct test_desc_t* next;
};
} test_desc_t;
void unity_testcase_register(struct test_desc_t* desc);
void unity_testcase_register(test_desc_t* desc);
/* Test case macro, a-la CATCH framework.
@@ -86,7 +87,7 @@ void unity_testcase_register(struct test_desc_t* desc);
static void __attribute__((constructor)) UNITY_TEST_UID(test_reg_helper_) () \
{ \
static test_func test_fn_[] = {&UNITY_TEST_UID(test_func_)}; \
static struct test_desc_t UNITY_TEST_UID(test_desc_) = { \
static test_desc_t UNITY_TEST_UID(test_desc_) = { \
.name = name_, \
.desc = desc_, \
.fn = test_fn_, \
@@ -116,7 +117,7 @@ void unity_testcase_register(struct test_desc_t* desc);
UNITY_TEST_FN_SET(__VA_ARGS__); \
static void __attribute__((constructor)) UNITY_TEST_UID(test_reg_helper_) () \
{ \
static struct test_desc_t UNITY_TEST_UID(test_desc_) = { \
static test_desc_t UNITY_TEST_UID(test_desc_) = { \
.name = name_, \
.desc = desc_"[multi_stage]", \
.fn = UNITY_TEST_UID(test_functions), \
@@ -141,7 +142,7 @@ void unity_testcase_register(struct test_desc_t* desc);
UNITY_TEST_FN_SET(__VA_ARGS__); \
static void __attribute__((constructor)) UNITY_TEST_UID(test_reg_helper_) () \
{ \
static struct test_desc_t UNITY_TEST_UID(test_desc_) = { \
static test_desc_t UNITY_TEST_UID(test_desc_) = { \
.name = name_, \
.desc = desc_"[multi_device]", \
.fn = UNITY_TEST_UID(test_functions), \
@@ -162,3 +163,12 @@ void unity_testcase_register(struct test_desc_t* desc);
* field names are treated as annotations and don't affect initialization
* order. Also make sure all the fields are initialized.
*/
void unity_run_test_by_name(const char *name);
void unity_run_tests_by_tag(const char *tag, bool invert);
void unity_run_all_tests();
void unity_run_menu();