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

Fixed regression on --pattern handling

Browse source
This commit is contained in:
Snaipe 2015-09-07 16:17:16 +02:00
parent d7466dc0e5
commit f6b6139607
1 changed files with 6 additions and 8 deletions

14
src/runner.c
View file

@ -352,14 +352,7 @@ struct criterion_test_set *criterion_initialize(void) {
if (resume_child()) // (windows only) resume from the fork if (resume_child()) // (windows only) resume from the fork
exit(0); exit(0);
struct criterion_test_set *set = criterion_init(); return criterion_init();
#ifdef HAVE_PCRE
if (criterion_options.pattern)
disable_unmatching(set);
#endif
return set;
} }
void criterion_finalize(struct criterion_test_set *set) { void criterion_finalize(struct criterion_test_set *set) {
@ -389,6 +382,11 @@ cleanup:
} }
int criterion_run_all_tests(struct criterion_test_set *set) { int criterion_run_all_tests(struct criterion_test_set *set) {
#ifdef HAVE_PCRE
if (criterion_options.pattern)
disable_unmatching(set);
#endif
set_runner_process(); set_runner_process();
int res = criterion_run_all_tests_impl(set); int res = criterion_run_all_tests_impl(set);
unset_runner_process(); unset_runner_process();