aba8187e4d
7187c7bbb8(t4210: skip i18n tests that don't work on FreeBSD, 2019-11-27) adds a REG_ILLSEQ prerequisite to avoid failures from the tests added in4e2443b181(log tests: test regex backends in "--encode=<enc>" tests, 2019-06-28), but hardcodes it to be only enabled in FreeBSD. Instead of hardcoding the affected platform, teach the test-regex helper, how to validate a pattern and report back, so it can be used to detect the same issue in other affected systems (like DragonFlyBSD or macOS). While at it, refactor the tool so it can report back the source of the errors it founds, and can be invoked also in a --silent mode, when needed, for backward compatibility. A missing flag has been added and the code reformatted, as well as updates to the way the parameters are handled, for consistency. To minimize changes, it is assumed the regcomp error is of the right type since we control the only caller, and is also assumed to affect both basic and extended syntax (only basic is tested, but both behave the same in all three affected platforms since they use the same function). Based-on-patch-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
115 lines
2.2 KiB
C
115 lines
2.2 KiB
C
#include "test-tool.h"
|
|
#include "gettext.h"
|
|
|
|
struct reg_flag {
|
|
const char *name;
|
|
int flag;
|
|
};
|
|
|
|
static struct reg_flag reg_flags[] = {
|
|
{ "EXTENDED", REG_EXTENDED },
|
|
{ "NEWLINE", REG_NEWLINE },
|
|
{ "ICASE", REG_ICASE },
|
|
{ "NOTBOL", REG_NOTBOL },
|
|
{ "NOTEOL", REG_NOTEOL },
|
|
#ifdef REG_STARTEND
|
|
{ "STARTEND", REG_STARTEND },
|
|
#endif
|
|
{ NULL, 0 }
|
|
};
|
|
|
|
static int test_regex_bug(void)
|
|
{
|
|
char *pat = "[^={} \t]+";
|
|
char *str = "={}\nfred";
|
|
regex_t r;
|
|
regmatch_t m[1];
|
|
|
|
if (regcomp(&r, pat, REG_EXTENDED | REG_NEWLINE))
|
|
die("failed regcomp() for pattern '%s'", pat);
|
|
if (regexec(&r, str, 1, m, 0))
|
|
die("no match of pattern '%s' to string '%s'", pat, str);
|
|
|
|
/* http://sourceware.org/bugzilla/show_bug.cgi?id=3957 */
|
|
if (m[0].rm_so == 3) /* matches '\n' when it should not */
|
|
die("regex bug confirmed: re-build git with NO_REGEX=1");
|
|
|
|
return 0;
|
|
}
|
|
|
|
int cmd__regex(int argc, const char **argv)
|
|
{
|
|
const char *pat;
|
|
const char *str;
|
|
int ret, silent = 0, flags = 0;
|
|
regex_t r;
|
|
regmatch_t m[1];
|
|
char errbuf[64];
|
|
|
|
argv++;
|
|
argc--;
|
|
|
|
if (!argc)
|
|
goto usage;
|
|
|
|
if (!strcmp(*argv, "--bug")) {
|
|
if (argc == 1)
|
|
return test_regex_bug();
|
|
else
|
|
goto usage;
|
|
}
|
|
if (!strcmp(*argv, "--silent")) {
|
|
silent = 1;
|
|
argv++;
|
|
argc--;
|
|
}
|
|
if (!argc)
|
|
goto usage;
|
|
|
|
pat = *argv++;
|
|
if (argc == 1)
|
|
str = NULL;
|
|
else {
|
|
str = *argv++;
|
|
while (*argv) {
|
|
struct reg_flag *rf;
|
|
for (rf = reg_flags; rf->name; rf++)
|
|
if (!strcmp(*argv, rf->name)) {
|
|
flags |= rf->flag;
|
|
break;
|
|
}
|
|
if (!rf->name)
|
|
die("do not recognize flag %s", *argv);
|
|
argv++;
|
|
}
|
|
}
|
|
git_setup_gettext();
|
|
|
|
ret = regcomp(&r, pat, flags);
|
|
if (ret) {
|
|
if (silent)
|
|
return ret;
|
|
|
|
regerror(ret, &r, errbuf, sizeof(errbuf));
|
|
die("failed regcomp() for pattern '%s' (%s)", pat, errbuf);
|
|
}
|
|
if (!str)
|
|
return 0;
|
|
|
|
ret = regexec(&r, str, 1, m, 0);
|
|
if (ret) {
|
|
if (silent || ret == REG_NOMATCH)
|
|
return ret;
|
|
|
|
regerror(ret, &r, errbuf, sizeof(errbuf));
|
|
die("failed regexec() for subject '%s' (%s)", str, errbuf);
|
|
}
|
|
|
|
return 0;
|
|
usage:
|
|
usage("\ttest-tool regex --bug\n"
|
|
"\ttest-tool regex [--silent] <pattern>\n"
|
|
"\ttest-tool regex [--silent] <pattern> <string> [<options>]");
|
|
return -1;
|
|
}
|