test-regex: isolate the bug test code

pclouds · gitster · commit 949782d86088 · 2016-06-27T07:31:35.000-07:00
This is in preparation to turn test-regex into some generic regex
testing command.

Helped-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Helped-by: Ramsay Jones &lt;ramsay@ramsayjones.plus.com&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
@@ -31,7 +31,7 @@ test_expect_success 'git_mkstemps_mode does not fail if fd 0 is not open' '
 
 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-regex --bug
 '
 
 test_done
diff --git a/test-regex.c b/test-regex.c
@@ -1,6 +1,6 @@
 #include "git-compat-util.h"
 
-int main(int argc, char **argv)
+static int test_regex_bug(void)
 {
 	char *pat = "[^={} \t]+";
 	char *str = "={}\nfred";
@@ -16,5 +16,13 @@ int main(int argc, char **argv)
 	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);
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	if (argc == 2 && !strcmp(argv[1], "--bug"))
+		return test_regex_bug();
+	else
+		usage("test-regex --bug");
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ test_expect_success 'git_mkstemps_mode does not fail if fd 0 is not open' '`
`31`	`31`
`32`	`32`	`test_expect_success 'check for a bug in the regex routines' '`
`33`	`33`	`# if this test fails, re-build git with NO_REGEX=1`
`34`		`- test-regex`
	`34`	`+ test-regex --bug`
`35`	`35`	`'`
`36`	`36`
`37`	`37`	`test_done`