mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-09 12:48:43 +00:00
Test: Fixed annoying warnings (and possible obscure bugs).
This commit is contained in:
parent
bb001af0e8
commit
1322e205e2
@ -29,7 +29,7 @@ parse_config_file(const void *filename_void)
|
|||||||
|
|
||||||
size_t fn_size = strlen((const char *) filename_void) + 1;
|
size_t fn_size = strlen((const char *) filename_void) + 1;
|
||||||
char *filename = alloca(fn_size);
|
char *filename = alloca(fn_size);
|
||||||
strncpy(filename, filename_void, fn_size);
|
memcpy(filename, filename_void, fn_size);
|
||||||
|
|
||||||
struct config *c = bt_config_file_parse(filename);
|
struct config *c = bt_config_file_parse(filename);
|
||||||
bt_bird_cleanup();
|
bt_bird_cleanup();
|
||||||
|
@ -149,10 +149,7 @@ int bt_run_test_fn(int (*fn)(const void *), const void *fn_arg, int timeout)
|
|||||||
int result;
|
int result;
|
||||||
alarm(timeout);
|
alarm(timeout);
|
||||||
|
|
||||||
if (fn_arg)
|
|
||||||
result = fn(fn_arg);
|
result = fn(fn_arg);
|
||||||
else
|
|
||||||
result = ((int (*)(void))fn)();
|
|
||||||
|
|
||||||
if (!bt_suite_result)
|
if (!bt_suite_result)
|
||||||
result = 0;
|
result = 0;
|
||||||
|
@ -55,11 +55,13 @@ void bt_log_suite_case_result(int result, const char *fmt, ...);
|
|||||||
#define BT_PROMPT_FAIL_NO_COLOR " [" "FAIL" "] "
|
#define BT_PROMPT_FAIL_NO_COLOR " [" "FAIL" "] "
|
||||||
#define BT_PROMPT_OK_FAIL_STRLEN 8 /* strlen ' [FAIL] ' */
|
#define BT_PROMPT_OK_FAIL_STRLEN 8 /* strlen ' [FAIL] ' */
|
||||||
|
|
||||||
|
static inline int bt_test_fn_noarg(const void *cp) { return ((int (*)(void)) cp)(); }
|
||||||
|
|
||||||
#define bt_test_suite(fn, dsc, ...) \
|
#define bt_test_suite(fn, dsc, ...) \
|
||||||
bt_test_suite_extra(fn, BT_FORKING, BT_TIMEOUT, dsc, ##__VA_ARGS__)
|
bt_test_suite_extra(fn, BT_FORKING, BT_TIMEOUT, dsc, ##__VA_ARGS__)
|
||||||
|
|
||||||
#define bt_test_suite_extra(fn, f, t, dsc, ...) \
|
#define bt_test_suite_extra(fn, f, t, dsc, ...) \
|
||||||
bt_test_suite_base((int (*)(const void *))fn, #fn, NULL, f, t, dsc, ##__VA_ARGS__)
|
bt_test_suite_base(bt_test_fn_noarg, #fn, fn, f, t, dsc, ##__VA_ARGS__)
|
||||||
|
|
||||||
#define bt_test_suite_arg(fn, arg, dsc, ...) \
|
#define bt_test_suite_arg(fn, arg, dsc, ...) \
|
||||||
bt_test_suite_arg_extra(fn, arg, BT_FORKING, BT_TIMEOUT, dsc, ##__VA_ARGS__)
|
bt_test_suite_arg_extra(fn, arg, BT_FORKING, BT_TIMEOUT, dsc, ##__VA_ARGS__)
|
||||||
|
Loading…
Reference in New Issue
Block a user