diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-14 20:46:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 20:46:39 -0700 |
| commit | dabdc0178ec043ad42f6b3ab80e54f9c9404ab42 (patch) | |
| tree | 3d95ce8b23f406b2ad3a5cf4b708cc034b0810ca | |
| parent | Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11 (diff) | |
| parent | test-regex: Add a test to check for a bug in the regex routines (diff) | |
| download | tgif-dabdc0178ec043ad42f6b3ab80e54f9c9404ab42.tar.xz | |
Merge branch 'rj/test-regex' into maint-1.7.11
* rj/test-regex:
test-regex: Add a test to check for a bug in the regex routines
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | t/t0070-fundamental.sh | 5 | ||||
| -rw-r--r-- | test-regex.c | 20 |
4 files changed, 27 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index bf66648e2c..f1acd3e777 100644 --- a/.gitignore +++ b/.gitignore @@ -186,6 +186,7 @@ /test-mktemp /test-parse-options /test-path-utils +/test-regex /test-revision-walking /test-run-command /test-sha1 @@ -495,6 +495,7 @@ TEST_PROGRAMS_NEED_X += test-mergesort TEST_PROGRAMS_NEED_X += test-mktemp TEST_PROGRAMS_NEED_X += test-parse-options TEST_PROGRAMS_NEED_X += test-path-utils +TEST_PROGRAMS_NEED_X += test-regex TEST_PROGRAMS_NEED_X += test-revision-walking TEST_PROGRAMS_NEED_X += test-run-command TEST_PROGRAMS_NEED_X += test-scrap-cache-tree diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh index 9bee8bfd2e..da2c504e53 100755 --- a/t/t0070-fundamental.sh +++ b/t/t0070-fundamental.sh @@ -25,4 +25,9 @@ test_expect_success POSIXPERM 'mktemp to unwritable directory prints filename' ' grep "cannotwrite/test" err ' +test_expect_success 'check for a bug in the regex routines' ' + # if this test fails, re-build git with NO_REGEX=1 + test-regex +' + test_done diff --git a/test-regex.c b/test-regex.c new file mode 100644 index 0000000000..b5bfd54139 --- /dev/null +++ b/test-regex.c @@ -0,0 +1,20 @@ +#include <git-compat-util.h> + +int main(int argc, char **argv) +{ + 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"); + + exit(0); +} |