diff --git a/include/criterion/logging.h b/include/criterion/logging.h index 26fb281..360b1b4 100644 --- a/include/criterion/logging.h +++ b/include/criterion/logging.h @@ -100,8 +100,8 @@ CR_API void cr_log(enum criterion_severity severity, const char *msg, ...); struct criterion_logger { void (*log_pre_all )(struct criterion_test_set *set); void (*log_pre_suite )(struct criterion_suite_set *set); - void (*log_pre_init )(struct criterion_test *test); - void (*log_pre_test )(struct criterion_test *test); + void (*log_pre_init )(struct criterion_suite *suite, struct criterion_test *test); + void (*log_pre_test )(struct criterion_suite *suite, struct criterion_test *test); void (*log_assert )(struct criterion_assert_stats *stats); void (*log_theory_fail )(struct criterion_theory_stats *stats); void (*log_test_timeout )(struct criterion_test_stats *stats); diff --git a/po/de.po b/po/de.po index 7b7637c..27e5d68 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Criterion \n" "Report-Msgid-Bugs-To: franklinmathieu+criterion@gmail.com\n" -"POT-Creation-Date: 2016-09-04 10:11+0200\n" +"POT-Creation-Date: 2016-09-05 09:59+0200\n" "PO-Revision-Date: 2016-02-12 11:12+0100\n" "Last-Translator: \n" "Language-Team: German\n" @@ -45,38 +45,43 @@ msgstr "%1$s::%2$s: Test wurde übersprungen\n" #: src/log/normal.c:49 #, c-format +msgid "%1$s::%2$s: Test is disabled\n" +msgstr "%1$s::%2$s: Test ist deaktiviert\n" + +#: src/log/normal.c:50 +#, c-format msgid "%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n" msgstr "%1$s%2$s%3$s:%4$s%5$d%6$s: Fehlerhafte Behauptung: %7$s\n" -#: src/log/normal.c:50 +#: src/log/normal.c:51 #, c-format msgid " Theory %1$s::%2$s failed with the following parameters: (%3$s)\n" msgstr "" " Hypothese %1$s::%2$s schlug fehl mit den folgenden Parametern: (%3$s)\n" -#: src/log/normal.c:51 +#: src/log/normal.c:52 #, c-format msgid "%1$s::%2$s: Timed out. (%3$3.2fs)\n" msgstr "%1$s::%2$s: Außerhalb der Vorgabezeit. (%3$3.2fs)\n" -#: src/log/normal.c:52 +#: src/log/normal.c:53 #, c-format msgid "%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n" msgstr "" "%1$s%2$s%3$s:%4$s%5$u%6$s: Unerwartetes Signal gefangen unterhalb dieser " "Zeile!\n" -#: src/log/normal.c:53 +#: src/log/normal.c:54 #, c-format msgid "%1$s::%2$s: CRASH!\n" msgstr "%1$s::%2$s: ABSTURZ!\n" -#: src/log/normal.c:54 +#: src/log/normal.c:55 #, c-format msgid "%1$s::%2$s: %3$s\n" msgstr "%1$s::%2$s: %3$s\n" -#: src/log/normal.c:55 +#: src/log/normal.c:56 #, c-format msgid "" "%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown." @@ -85,7 +90,7 @@ msgstr "" "%1$sWarnung! Der Test `%2$s::%3$s` ist abgestürzt während der " "Initialisierung oder Beendung %4$s\n" -#: src/log/normal.c:56 +#: src/log/normal.c:57 #, c-format msgid "" "%1$sWarning! The test `%2$s::%3$s` exited during its setup or teardown.%4$s\n" @@ -93,14 +98,14 @@ msgstr "" "%1$sWarnung! Der Test `%2$s::%3$s` hat sich beendet während der " "Initialisierung oder Beendung.%4$s\n" -#: src/log/normal.c:57 +#: src/log/normal.c:58 #, c-format msgid "Running %1$s%2$lu%3$s test from %4$s%5$s%6$s:\n" msgid_plural "Running %1$s%2$lu%3$s tests from %4$s%5$s%6$s:\n" msgstr[0] "Führe %1$s%2$lu%3$s Test durch von %4$s%5$s%6$s:\n" msgstr[1] "Führe %1$s%2$lu%3$s Tests durch von %4$s%5$s%6$s:\n" -#: src/log/normal.c:59 +#: src/log/normal.c:60 #, c-format msgid "" "%1$sSynthesis: Tested: %2$s%3$lu%4$s | Passing: %5$s%6$lu%7$s | Failing: %8$s" @@ -197,6 +202,3 @@ msgstr "" #, c-format msgid "Writing %1$s report in `%2$s`.\n" msgstr "Schreibe Bericht von %1$s nach `%2$s`.\n" - -#~ msgid "%1$s::%2$s: Test is disabled\n" -#~ msgstr "%1$s::%2$s: Test ist deaktiviert\n" diff --git a/po/fr.po b/po/fr.po index 3fb2be5..1b6e9fb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: criterion 2.0.0\n" "Report-Msgid-Bugs-To: franklinmathieu+criterion@gmail.com\n" -"POT-Creation-Date: 2016-09-04 10:11+0200\n" +"POT-Creation-Date: 2016-09-05 09:59+0200\n" "PO-Revision-Date: 2015-04-03 17:58+0200\n" "Last-Translator: \n" "Language-Team: French\n" @@ -45,38 +45,43 @@ msgstr "%1$s::%2$s: Le test a été sauté\n" #: src/log/normal.c:49 #, c-format +msgid "%1$s::%2$s: Test is disabled\n" +msgstr "%1$s::%2$s: Le test est désactivé\n" + +#: src/log/normal.c:50 +#, c-format msgid "%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n" msgstr "%1$s%2$s%3$s:%4$s%5$d%6$s: Échec d'assertion: %7$s\n" -#: src/log/normal.c:50 +#: src/log/normal.c:51 #, fuzzy, c-format msgid " Theory %1$s::%2$s failed with the following parameters: (%3$s)\n" msgstr "" " La théorie %1$s::%2$s a échoué avec les paramètres suivants: (%3$s)\n" -#: src/log/normal.c:51 +#: src/log/normal.c:52 #, fuzzy, c-format msgid "%1$s::%2$s: Timed out. (%3$3.2fs)\n" msgstr "%1$s::%2$s: Délai expiré. (%3$3.2fs)\n" -#: src/log/normal.c:52 +#: src/log/normal.c:53 #, c-format msgid "%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n" msgstr "" "%1$s%2$s%3$s:%4$s%5$u%6$s: Un signal inattendu a été reçu après cette " "ligne!\n" -#: src/log/normal.c:53 +#: src/log/normal.c:54 #, c-format msgid "%1$s::%2$s: CRASH!\n" msgstr "%1$s::%2$s: PLANTAGE!\n" -#: src/log/normal.c:54 +#: src/log/normal.c:55 #, fuzzy, c-format msgid "%1$s::%2$s: %3$s\n" msgstr "%1$s::%2$s: (%3$3.2fs)\n" -#: src/log/normal.c:55 +#: src/log/normal.c:56 #, fuzzy, c-format msgid "" "%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown." @@ -85,7 +90,7 @@ msgstr "" "%1$sAttention! Le test `%2$s::%3$s` a planté pendant son initialisation ou " "sa finalisation.%4$s\n" -#: src/log/normal.c:56 +#: src/log/normal.c:57 #, fuzzy, c-format msgid "" "%1$sWarning! The test `%2$s::%3$s` exited during its setup or teardown.%4$s\n" @@ -93,14 +98,14 @@ msgstr "" "%1$sAttention! Le test `%2$s::%3$s` a quitté pendant son initialisation ou " "sa finalisation.%4$s\n" -#: src/log/normal.c:57 +#: src/log/normal.c:58 #, c-format msgid "Running %1$s%2$lu%3$s test from %4$s%5$s%6$s:\n" msgid_plural "Running %1$s%2$lu%3$s tests from %4$s%5$s%6$s:\n" msgstr[0] "Lancement de %1$s%2$lu%3$s test dans %4$s%5$s%6$s:\n" msgstr[1] "Lancement de %1$s%2$lu%3$s tests dans %4$s%5$s%6$s:\n" -#: src/log/normal.c:59 +#: src/log/normal.c:60 #, c-format msgid "" "%1$sSynthesis: Tested: %2$s%3$lu%4$s | Passing: %5$s%6$lu%7$s | Failing: %8$s" @@ -199,6 +204,3 @@ msgstr "" #, c-format msgid "Writing %1$s report in `%2$s`.\n" msgstr "Écriture du rapport %1$s dans `%2$s`.\n" - -#~ msgid "%1$s::%2$s: Test is disabled\n" -#~ msgstr "%1$s::%2$s: Le test est désactivé\n" diff --git a/src/core/client.c b/src/core/client.c index e819f5b..d5aacd5 100644 --- a/src/core/client.c +++ b/src/core/client.c @@ -261,7 +261,7 @@ bool handle_pre_init(struct server_ctx *sctx, struct client_ctx *ctx, const crit if (ctx->state == 0) { // only pre_init if there are no nested states push_event_noreport(PRE_INIT); report(PRE_INIT, ctx->test); - log(pre_init, ctx->test); + log(pre_init, ctx->suite, ctx->test); } return false; } @@ -273,7 +273,7 @@ bool handle_pre_test(struct server_ctx *sctx, struct client_ctx *ctx, const crit if (ctx->state < CS_MAX_CLIENT_STATES) { push_event_noreport(PRE_TEST); report(PRE_TEST, ctx->test); - log(pre_test, ctx->test); + log(pre_test, ctx->suite, ctx->test); } return false; } @@ -357,6 +357,7 @@ bool handle_skip(struct server_ctx *sctx, struct client_ctx *ctx, const criterio double elapsed_time = 0; push_event(POST_TEST, .data = &elapsed_time); push_event(POST_FINI); + log(post_test, ctx->tstats); } return false; } diff --git a/src/core/runner_coroutine.c b/src/core/runner_coroutine.c index ea5382e..4dd0828 100644 --- a/src/core/runner_coroutine.c +++ b/src/core/runner_coroutine.c @@ -353,6 +353,7 @@ static int skip_disabled(struct run_next_context *ctx) ctx->suite_stats, ctx->test_stats, &(struct event) { .kind = PRE_INIT }); + log(pre_init, ctx->suite_stats->suite, ctx->test); sfree(ctx->test_stats); return 1; } @@ -412,7 +413,6 @@ bxf_instance *cri_run_next_test(struct criterion_test_set *p_set, } report(POST_SUITE, ctx->suite_stats); - log(post_suite, ctx->suite_stats); sfree(ctx->suite_stats); } diff --git a/src/log/normal.c b/src/log/normal.c index 1d93ff4..dbb0763 100644 --- a/src/log/normal.c +++ b/src/log/normal.c @@ -46,12 +46,13 @@ static msg_t msg_desc = N_(" %s\n"); static msg_t msg_pre_init = N_("%1$s::%2$s\n"); static msg_t msg_post_test_timed = N_("%1$s::%2$s: (%3$3.2fs)\n"); static msg_t msg_post_test_skip = N_("%1$s::%2$s: Test was skipped\n"); +static msg_t msg_test_disabled = N_("%1$s::%2$s: Test is disabled\n"); static msg_t msg_assert_fail = N_("%1$s%2$s%3$s:%4$s%5$d%6$s: Assertion failed: %7$s\n"); static msg_t msg_theory_fail = N_(" Theory %1$s::%2$s failed with the following parameters: (%3$s)\n"); static msg_t msg_test_timeout = N_("%1$s::%2$s: Timed out. (%3$3.2fs)\n"); static msg_t msg_test_crash_line = N_("%1$s%2$s%3$s:%4$s%5$u%6$s: Unexpected signal caught below this line!\n"); static msg_t msg_test_crash = N_("%1$s::%2$s: CRASH!\n"); -static msg_t msg_test_abort = N_("%1$s::%2$s: %3$s\n"); +static msg_t msg_test_generic = N_("%1$s::%2$s: %3$s\n"); static msg_t msg_test_other_crash = N_("%1$sWarning! The test `%2$s::%3$s` crashed during its setup or teardown.%4$s\n"); static msg_t msg_test_abnormal_exit = N_("%1$sWarning! The test `%2$s::%3$s` exited during its setup or teardown.%4$s\n"); static msg_t msg_pre_suite[] = N_s("Running %1$s%2$lu%3$s test from %4$s%5$s%6$s:\n", @@ -65,12 +66,13 @@ static msg_t msg_post_all = N_("%1$sSynthesis: Tested: %2$s%3$lu%4$s " static msg_t msg_pre_init = "%s::%s\n"; static msg_t msg_post_test_timed = "%s::%s: (%3.2fs)\n"; static msg_t msg_post_test_skip = "%1$s::%2$s: Test was skipped\n"; +static msg_t msg_test_disabled = "%1$s::%2$s: Test is disabled\n"; static msg_t msg_assert_fail = "%s%s%s:%s%d%s: Assertion failed: %s\n"; static msg_t msg_theory_fail = " Theory %s::%s failed with the following parameters: (%s)\n"; static msg_t msg_test_timeout = "%s::%s: Timed out. (%3.2fs)\n"; static msg_t msg_test_crash_line = "%s%s%s:%s%u%s: Unexpected signal caught below this line!\n"; static msg_t msg_test_crash = "%s::%s: CRASH!\n"; -static msg_t msg_test_abort = "%s::%s: %s\n"; +static msg_t msg_test_generic = "%s::%s: %s\n"; static msg_t msg_test_other_crash = "%sWarning! The test `%s::%s` crashed during its setup or teardown.%s\n"; static msg_t msg_test_abnormal_exit = "%sWarning! The test `%s::%s` exited during its setup or teardown.%s\n"; static msg_t msg_pre_suite[] = { "Running %s%lu%s test from %s%s%s:\n", @@ -86,10 +88,16 @@ void normal_log_pre_all(CR_UNUSED struct criterion_test_set *set) { criterion_pinfo(CRITERION_PREFIX_DASHES, _(msg_pre_all), VERSION); } -void normal_log_pre_init(struct criterion_test *test) { - criterion_pinfo(CRITERION_PREFIX_RUN, _(msg_pre_init), +void normal_log_pre_init(struct criterion_suite *suite,struct criterion_test *test) { + if(test->data->disabled || (suite->data && suite->data->disabled)) { + criterion_pinfo(CRITERION_PREFIX_SKIP, _(msg_test_disabled), + test->category, + test->name); + } else { + criterion_pinfo(CRITERION_PREFIX_RUN, _(msg_pre_init), test->category, test->name); + } if (test->data->description) criterion_pinfo(CRITERION_PREFIX_DASHES, _(msg_desc), @@ -105,30 +113,22 @@ void normal_log_post_test(struct criterion_test_stats *stats) { = stats->test_status == CR_STATUS_FAILED ? CRITERION_PREFIX_FAIL : CRITERION_PREFIX_PASS; - criterion_plog(level, prefix, _(format), - stats->test->category, - stats->test->name, - stats->elapsed_time); -} - -void normal_log_post_suite(struct criterion_suite_stats *stats) { - for (struct criterion_test_stats *ts = stats->tests; ts; ts = ts->next) { - if(ts->test_status == CR_STATUS_SKIPPED){ - if(!ts->message) { - criterion_pinfo(CRITERION_PREFIX_SKIP, _(msg_post_test_skip), - ts->test->category, - ts->test->name); - } else { - criterion_pinfo(CRITERION_PREFIX_SKIP, "%s::%s: %s\n", - ts->test->category, - ts->test->name, - ts->message); - } - - if (ts->test->data->description) - criterion_pinfo(CRITERION_PREFIX_DASHES, msg_desc, - ts->test->data->description); + if(stats->test_status == CR_STATUS_SKIPPED) { + if(!stats->message) { + criterion_pinfo(CRITERION_PREFIX_SKIP, _(msg_post_test_skip), + stats->test->category, + stats->test->name); + } else { + criterion_pinfo(CRITERION_PREFIX_SKIP, _(msg_test_generic), + stats->test->category, + stats->test->name, + stats->message); } + } else { + criterion_plog(level, prefix, _(format), + stats->test->category, + stats->test->name, + stats->elapsed_time); } } @@ -194,6 +194,10 @@ void normal_log_pre_suite(struct criterion_suite_set *set) { _s(msg_pre_suite[0], msg_pre_suite[1], set->tests->size), CR_FG_BLUE, (unsigned long) set->tests->size, CR_RESET, CR_FG_GOLD, set->suite.name, CR_RESET); + + if (set->suite.data && set->suite.data->description) + criterion_pinfo(CRITERION_PREFIX_DASHES, _(msg_desc), + set->suite.data->description); } void normal_log_theory_fail(struct criterion_theory_stats *stats) { @@ -219,7 +223,7 @@ void normal_log_test_abort(CR_UNUSED struct criterion_test_stats *stats, const c char *line = strtok_r(dup, "\n", &saveptr); criterion_pimportant(CRITERION_PREFIX_DASHES, - _(msg_test_abort), + _(msg_test_generic), stats->test->category, stats->test->name, line); @@ -254,7 +258,6 @@ struct criterion_logger normal_logging = { .log_other_crash = normal_log_other_crash, .log_abnormal_exit = normal_log_abnormal_exit, .log_post_test = normal_log_post_test, - .log_post_suite = normal_log_post_suite, .log_post_all = normal_log_post_all, .log_message = normal_log_message, }; diff --git a/test/cram/pattern.t b/test/cram/pattern.t index 7d7a543..e3d305a 100644 --- a/test/cram/pattern.t +++ b/test/cram/pattern.t @@ -3,25 +3,25 @@ Testing normal globs $ simple.c.bin --filter='*/passing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='*/pa?sing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/passing?' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/*' --verbose @@ -42,24 +42,24 @@ Testing character classes $ simple.c.bin --filter='misc/[pf]assing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/[p-s]assing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/[!f]ailing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) - [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m0\x1b[0;1m | Passing: \x1b[0;32m0\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/[p-f]ailing' --verbose @@ -74,9 +74,9 @@ Testing character classes $ simple.c.bin --filter='misc/[!azerty]assing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) @@ -97,18 +97,18 @@ Testing extended globs $ simple.c.bin --filter='@(misc)/passing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='*(misc)/pa+(s)ing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) @@ -126,18 +126,18 @@ Testing extended globs $ simple.c.bin --filter='!(*/failing|*/fail)' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/?(passing)' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/?(passing|failing)' --verbose @@ -169,23 +169,23 @@ Testing nested extglob patterns $ simple.c.bin --filter='@(+(nest)ed)' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) - [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m0\x1b[0;1m | Passing: \x1b[0;32m0\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='?(*(a|b))' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) - [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m0\x1b[0;1m | Passing: \x1b[0;32m0\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) $ simple.c.bin --filter='misc/pa@(s|*(s))ing' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34mRUN \x1b[0m] misc::passing (esc) \[\\x1b\[0;32mPASS\\x1b\[0m\] misc::passing: \(\d\.\d\ds\) \(esc\) (re) - [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m1\x1b[0;1m | Passing: \x1b[0;32m1\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) @@ -227,8 +227,8 @@ Testing special char escaping $ simple.c.bin --filter='\!escaped' --verbose [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) - [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;33mSKIP\x1b[0m] misc::failing: Test was skipped (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::passing: Test was skipped (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m0\x1b[0;1m | Passing: \x1b[0;32m0\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc) diff --git a/test/cram/skip.t b/test/cram/skip.t index 7aceca1..808fecc 100644 --- a/test/cram/skip.t +++ b/test/cram/skip.t @@ -4,7 +4,7 @@ Testing skipping [\x1b[0;34m----\x1b[0m] Criterion v2.2.1 (esc) [\x1b[0;34m====\x1b[0m] Running \x1b[0;34m2\x1b[0m tests from \x1b[0;33mmisc\x1b[0m: (esc) [\x1b[0;34mRUN \x1b[0m] misc::message (esc) + [\x1b[0;33mSKIP\x1b[0m] misc::message: Skips may take printf-like messages (esc) [\x1b[0;34mRUN \x1b[0m] misc::skipping (esc) [\x1b[0;33mSKIP\x1b[0m] misc::skipping: Test was skipped (esc) - [\x1b[0;33mSKIP\x1b[0m] misc::message: Skips may take printf-like messages (esc) [\x1b[0;34m====\x1b[0m] \x1b[0;1mSynthesis: Tested: \x1b[0;34m0\x1b[0;1m | Passing: \x1b[0;32m0\x1b[0;1m | Failing: \x1b[0m0\x1b[0;1m | Crashing: \x1b[0m0\x1b[0;1m \x1b[0m (esc)