From f6b6139607f8b66b7d8166398d0283da8ea5cb52 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Mon, 7 Sep 2015 16:17:16 +0200 Subject: [PATCH] Fixed regression on --pattern handling --- src/runner.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/runner.c b/src/runner.c index ed05315..5e078ea 100644 --- a/src/runner.c +++ b/src/runner.c @@ -352,14 +352,7 @@ struct criterion_test_set *criterion_initialize(void) { if (resume_child()) // (windows only) resume from the fork exit(0); - struct criterion_test_set *set = criterion_init(); - - #ifdef HAVE_PCRE - if (criterion_options.pattern) - disable_unmatching(set); - #endif - - return set; + return criterion_init(); } void criterion_finalize(struct criterion_test_set *set) { @@ -389,6 +382,11 @@ cleanup: } int criterion_run_all_tests(struct criterion_test_set *set) { + #ifdef HAVE_PCRE + if (criterion_options.pattern) + disable_unmatching(set); + #endif + set_runner_process(); int res = criterion_run_all_tests_impl(set); unset_runner_process();