stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Boyscouting.

Browse source
This commit is contained in:
Snaipe 2015-03-24 01:17:58 +01:00
parent 32d7f6e518
commit 7bb1240af1
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/log/normal.c
View file

@ -143,12 +143,12 @@ void normal_log_pre_suite(struct criterion_suite_set *set) {
}
struct criterion_output_provider normal_logging = {
.log_pre_all = normal_log_pre_all,
.log_pre_init = normal_log_pre_init,
.log_pre_suite = normal_log_pre_suite,
.log_post_test = normal_log_post_test,
.log_assert = normal_log_assert,
.log_post_suite = normal_log_post_suite,
.log_post_all = normal_log_post_all,
.log_pre_all = normal_log_pre_all,
.log_pre_init = normal_log_pre_init,
.log_pre_suite = normal_log_pre_suite,
.log_assert = normal_log_assert,
.log_test_crash = normal_log_test_crash,
.log_post_test = normal_log_post_test,
.log_post_suite = normal_log_post_suite,
.log_post_all = normal_log_post_all,
};

2
src/main.c
View file

@ -97,7 +97,7 @@ int list_tests(bool unicode) {
--tests == 0 ? end : node,
join,
t->name,
is_disabled(&s->suite, t) ? "(disabled)" : "");
is_disabled(&s->suite, t) ? " (disabled)" : "");
}
}
return 0;

25
src/runner.c
View file

@ -148,6 +148,15 @@ static inline bool is_disabled(struct criterion_test *t, struct criterion_suite
return t->data->disabled || (s->data && s->data->disabled);
}
#define push_event(Kind, ...) \
do { \
stat_push_event(stats, \
suite_stats, \
test_stats, \
&(struct event) { .kind = Kind, __VA_ARGS__ }); \
report(Kind, test_stats); \
} while (0)
static void run_test(struct criterion_global_stats *stats,
struct criterion_suite_stats *suite_stats,
struct criterion_test *test,
@ -156,8 +165,7 @@ static void run_test(struct criterion_global_stats *stats,
smart struct criterion_test_stats *test_stats = test_stats_init(test);
if (is_disabled(test, suite)) {
struct event ev = { .kind = PRE_TEST };
stat_push_event(stats, suite_stats, test_stats, &ev);
stat_push_event(stats, suite_stats, test_stats, &(struct event) { .kind = PRE_TEST });
return;
}
@ -182,18 +190,11 @@ static void run_test(struct criterion_global_stats *stats,
if (status.kind == SIGNAL) {
test_stats->signal = status.status;
if (test->data->signal == 0) {
struct event ev = { .kind = TEST_CRASH };
stat_push_event(stats, suite_stats, test_stats, &ev);
report(TEST_CRASH, test_stats);
push_event(TEST_CRASH);
} else {
double elapsed_time = 0;
struct event ev = { .kind = POST_TEST, .data = &elapsed_time };
stat_push_event(stats, suite_stats, test_stats, &ev);
report(POST_TEST, test_stats);
ev = (struct event) { .kind = POST_FINI, .data = NULL };
stat_push_event(stats, suite_stats, test_stats, &ev);
report(POST_FINI, test_stats);
push_event(POST_TEST, .data = &elapsed_time);
push_event(POST_FINI);
}
}
}