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

[runtime] Display an error message when a pattern has been set without extglob support

Browse source
This commit is contained in:
Snaipe 2016-01-20 16:03:32 +01:00
parent a670f7c361
commit a3ee1b1b99
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/runner.c
View file

@ -417,10 +417,13 @@ cleanup:
}
int criterion_run_all_tests(struct criterion_test_set *set) {
#ifdef HAVE_PCRE
if (criterion_options.pattern)
if (criterion_options.pattern) {
#ifdef HAVE_PCRE
disable_unmatching(set);
#endif
#else
criterion_perror("Did not filter tests by pattern: Criterion was compiled without extglob support.\n");
#endif
}
set_runner_process();
int res = criterion_run_all_tests_impl(set);

17
src/entry/params.c
View file

@ -42,14 +42,6 @@
# define VERSION_MSG "Tests compiled with Criterion v" VERSION "\n"
#ifdef HAVE_PCRE
# define PATTERN_USAGE \
" --pattern [PATTERN]: run tests matching the " \
"given pattern\n"
#else
# define PATTERN_USAGE
#endif
# define USAGE \
VERSION_MSG "\n" \
"usage: %s OPTIONS\n" \
@ -65,7 +57,8 @@
"or colors in the output\n" \
" -S or --short-filename: only display the base " \
"name of the source file on a failure\n" \
PATTERN_USAGE \
" --pattern [PATTERN]: run tests matching the " \
"given pattern\n" \
" --tap[=FILE]: writes TAP report in FILE " \
"(no file or \"-\" means stderr)\n" \
" --xml[=FILE]: writes XML report in FILE " \
@ -150,9 +143,7 @@ int criterion_handle_args(int argc, char *argv[], bool handle_unknown_arg) {
{"fail-fast", no_argument, 0, 'f'},
{"short-filename", no_argument, 0, 'S'},
{"single", required_argument, 0, 's'},
#ifdef HAVE_PCRE
{"pattern", required_argument, 0, 'p'},
#endif
{"always-succeed", no_argument, 0, 'y'},
{"no-early-exit", no_argument, 0, 'z'},
{"output", required_argument, 0, 'O'},
@ -194,11 +185,9 @@ int criterion_handle_args(int argc, char *argv[], bool handle_unknown_arg) {
if (env_short_filename)
opt->short_filename = !strcmp("1", env_short_filename);
#ifdef HAVE_PCRE
char *env_pattern = getenv("CRITERION_TEST_PATTERN");
if (env_pattern)
opt->pattern = env_pattern;
#endif
opt->measure_time = !!strcmp("1", DEF(getenv("CRITERION_DISABLE_TIME_MEASUREMENTS"), "0"));
@ -248,9 +237,7 @@ int criterion_handle_args(int argc, char *argv[], bool handle_unknown_arg) {
case 'f': criterion_options.fail_fast = true; break;
case 'S': criterion_options.short_filename = true; break;
case 's': run_single_test_by_name(optarg); return 0;
#ifdef HAVE_PCRE
case 'p': criterion_options.pattern = optarg; break;
#endif
case 'q': quiet = true; break;
{