Add macros to define test suite & runner

Four macros were added :
 - TTAIL_CHECK_START(char *test_suite_str, char *test_case_str)
 - TTAIL_SET_FIXTURE(void (*setup)(), void (*teardown)())
 - TTAIL_ADD_TEST( libcheck_test test)
 - TTAIL_CHECK_END

tests/ttail_argparse_badarg.c

@@ -74,24 +74,13 @@ START_TEST (test_argparse_bad7)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase *tc_argparse_badarg;
-
-	s = suite_create("ttail argument parsing checks");
-
-	tc_argparse_badarg = tcase_create("bad arguments parsing");
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad1);
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad2);
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad3);
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad4);
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad5);
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad6);
-	tcase_add_test(tc_argparse_badarg, test_argparse_bad7);
-
-	suite_add_tcase(s, tc_argparse_badarg);
-	return s;
-}
+TTAIL_CHECK_START("ttail argument parsing checks", "bad arguments parsing")
+	TTAIL_ADD_TEST(test_argparse_bad1);
+	TTAIL_ADD_TEST(test_argparse_bad2);
+	TTAIL_ADD_TEST(test_argparse_bad3);
+	TTAIL_ADD_TEST(test_argparse_bad4);
+	TTAIL_ADD_TEST(test_argparse_bad5);
+	TTAIL_ADD_TEST(test_argparse_bad6);
+	TTAIL_ADD_TEST(test_argparse_bad7);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_argparse_date_fmt.c

@@ -34,20 +34,10 @@ START_TEST (test_argparse_fmt_multiple)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase *tc_argparse_fmt;
-
-	s = suite_create("ttail argument parsing checks");
-
-	tc_argparse_fmt = tcase_create("date format arguments parsing");
-	tcase_add_test(tc_argparse_fmt, test_argparse_fmt_short);
-	tcase_add_test(tc_argparse_fmt, test_argparse_fmt_long);
-	tcase_add_test(tc_argparse_fmt, test_argparse_fmt_multiple);
-
-	suite_add_tcase(s, tc_argparse_fmt);
-	return s;
-}
+TTAIL_CHECK_START(	"ttail argument parsing checks", \
+			"date format arguments parsing")
+	TTAIL_ADD_TEST(test_argparse_fmt_short);
+	TTAIL_ADD_TEST(test_argparse_fmt_long);
+	TTAIL_ADD_TEST(test_argparse_fmt_multiple);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_argparse_empty.c

@@ -59,27 +59,15 @@ START_TEST (test_argparse_empty_session)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase *tc_argparse_empty;
-
-	s = suite_create("ttail argument parsing checks");
-
-	tc_argparse_empty = tcase_create("empty arguments parsing");
-	tcase_add_checked_fixture(tc_argparse_empty,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_logfilename);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_logfile);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_logfilesz);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_flag);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_fmt);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_verbose);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_prefixsz);
-	tcase_add_test(tc_argparse_empty, test_argparse_empty_session);
-
-	suite_add_tcase(s, tc_argparse_empty);
-	return s;
-}
+TTAIL_CHECK_START("ttail argument parsing checks", "empty arguments parsing")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_argparse_empty_logfilename);
+	TTAIL_ADD_TEST(test_argparse_empty_logfile);
+	TTAIL_ADD_TEST(test_argparse_empty_logfilesz);
+	TTAIL_ADD_TEST(test_argparse_empty_flag);
+	TTAIL_ADD_TEST(test_argparse_empty_fmt);
+	TTAIL_ADD_TEST(test_argparse_empty_verbose);
+	TTAIL_ADD_TEST(test_argparse_empty_prefixsz);
+	TTAIL_ADD_TEST(test_argparse_empty_session);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_argparse_files.c

@@ -91,22 +91,10 @@ START_TEST (test_argparse_file_multiple)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase *tc_argparse_files;
-
-	s = suite_create("ttail argument parsing checks");
-
-	tc_argparse_files = tcase_create("files options parse");
-	tcase_add_checked_fixture(tc_argparse_files,
-		setup_fname, teardown_fname);
-	tcase_add_test(tc_argparse_files, test_argparse_file_non_exist);
-	tcase_add_test(tc_argparse_files, test_argparse_file_exist);
-	tcase_add_test(tc_argparse_files, test_argparse_file_multiple);
-
-	suite_add_tcase(s, tc_argparse_files);
-	return s;
-}
+TTAIL_CHECK_START("ttail argument parsing checks", "files options parse")
+	TTAIL_SET_FIXTURE(setup_fname, teardown_fname);
+	TTAIL_ADD_TEST(test_argparse_file_non_exist);
+	TTAIL_ADD_TEST(test_argparse_file_exist);
+	TTAIL_ADD_TEST(test_argparse_file_multiple);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_argparse_re_prefix.c

@@ -59,22 +59,12 @@ START_TEST (test_argparse_prefix_multiple)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase *tc_argparse_prefix;
-
-	s = suite_create("ttail argument parsing checks");
-
-	tc_argparse_prefix = tcase_create("re-prefix arguments parsing");
-	tcase_add_test(tc_argparse_prefix, test_argparse_reprefix_short);
-	tcase_add_test(tc_argparse_prefix, test_argparse_reprefix_long);
-	tcase_add_test(tc_argparse_prefix, test_argparse_prefixlen_short);
-	tcase_add_test(tc_argparse_prefix, test_argparse_prefixlen_long);
-	tcase_add_test(tc_argparse_prefix, test_argparse_prefix_multiple);
-
-	suite_add_tcase(s, tc_argparse_prefix);
-	return s;
-}
+TTAIL_CHECK_START(	"ttail argument parsing checks",\
+			"re-prefix arguments parsing")
+	TTAIL_ADD_TEST(test_argparse_reprefix_short);
+	TTAIL_ADD_TEST(test_argparse_reprefix_long);
+	TTAIL_ADD_TEST(test_argparse_prefixlen_short);
+	TTAIL_ADD_TEST(test_argparse_prefixlen_long);
+	TTAIL_ADD_TEST(test_argparse_prefix_multiple);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_check.h

@@ -119,12 +119,40 @@ void teardown_closest_fileinit(void)
 	teardown_closest();
 }
 
-
-#define TTAIL_CHECK_MAIN(suite) int main(int argc, char **argv) {\
+/**@brief Start a ttail test
+ *@param const char* suite_str test suite string
+ *@param const char* tc_str test case string
+ */
+#define TTAIL_CHECK_START(suite_str, tc_str) \
+Suite * ttail_test_suite(void) \
+{\
+	Suite *s;\
+	TCase *tc;\
+	s = suite_create(suite_str);\
+	tc = tcase_create(tc_str);
+
+
+/**@brief Set the setup & teardown fixture
+ *@param void (*setup)()
+ *@param void (*teardown)()
+ */
+#define TTAIL_SET_FIXTURE(setup, teardown) \
+		tcase_add_checked_fixture(tc, setup, teardown)
+/**@brief Add a test function defined using START_TEST(name) { ... } END_TEST
+ */
+#define TTAIL_ADD_TEST(test) tcase_add_test(tc, test)
+
+/**@brief End a ttail test */
+#define TTAIL_CHECK_END \
+	suite_add_tcase(s, tc);\
+	return s;\
+}\
+\
+int main(int argc, char **argv) {\
 	int n_fail;\
 	SRunner *sr;\
 	chdir(dirname(argv[0])); /* move in ./tests dir */ \
-	sr = srunner_create(suite());\
+	sr = srunner_create(ttail_test_suite());\
 	srunner_set_fork_status(sr, CK_FORK);\
 	srunner_run_all(sr, CK_VERBOSE);\
 	n_fail = srunner_ntests_failed(sr);\

tests/ttail_init_check.c

@@ -42,22 +42,10 @@ START_TEST (test_init_check1)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_check;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_check = tcase_create("ttail_init_check() checks");
-	tcase_add_checked_fixture(tc_init_check,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_check, test_init_check_bad1);
-	tcase_add_test(tc_init_check, test_init_check_bad2);
-	tcase_add_test(tc_init_check, test_init_check1);
-
-	suite_add_tcase(s, tc_init_check);
-	return s;
-}
+TTAIL_CHECK_START("ttail init checks", "ttail_init_check() checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_init_check_bad1);
+	TTAIL_ADD_TEST(test_init_check_bad2);
+	TTAIL_ADD_TEST(test_init_check1);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_init_format.c

@@ -31,21 +31,9 @@ START_TEST (test_init_fmt_again)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_fmt;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_fmt = tcase_create("date format init checks");
-	tcase_add_checked_fixture(tc_init_fmt,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_fmt, test_init_fmt);
-	tcase_add_test(tc_init_fmt, test_init_fmt_again);
-
-	suite_add_tcase(s, tc_init_fmt);
-	return s;
-}
+TTAIL_CHECK_START("ttail init checks", "date format init checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_init_fmt);
+	TTAIL_ADD_TEST(test_init_fmt_again);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_init_format_guess.c

@@ -124,26 +124,14 @@ START_TEST (test_init_guess_fmt_set)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_fmt_guess;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_fmt_guess = tcase_create("date format guess init checks");
-	tcase_add_checked_fixture(tc_init_fmt_guess,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_date);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_datetime);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_datetime2);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_noguess);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_date_notm);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_noguess_notm);
-	tcase_add_test(tc_init_fmt_guess, test_init_guess_fmt_set);
-
-	suite_add_tcase(s, tc_init_fmt_guess);
-	return s;
-}
+TTAIL_CHECK_START("ttail init checks", "date format guess init checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_init_guess_date);
+	TTAIL_ADD_TEST(test_init_guess_datetime);
+	TTAIL_ADD_TEST(test_init_guess_datetime2);
+	TTAIL_ADD_TEST(test_init_guess_noguess);
+	TTAIL_ADD_TEST(test_init_guess_date_notm);
+	TTAIL_ADD_TEST(test_init_guess_noguess_notm);
+	TTAIL_ADD_TEST(test_init_guess_fmt_set);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_init_logfile.c

@@ -140,25 +140,13 @@ START_TEST (test_init_multiple_logfilename)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_logfile;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_logfile = tcase_create("logfile init checks");
-	tcase_add_checked_fixture(tc_init_logfile,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_logfile, test_init_empty_logfilename);
-	tcase_add_test(tc_init_logfile, test_init_nonexist_logfilename);
-	tcase_add_test(tc_init_logfile, test_init_exist_logfilename);
-	tcase_add_test(tc_init_logfile, test_init_same_exist_logfilename);
-	tcase_add_test(tc_init_logfile, test_init_same_nonexist_logfilename);
-	tcase_add_test(tc_init_logfile, test_init_multiple_logfilename);
-
-	suite_add_tcase(s, tc_init_logfile);
-	return s;
-}
+TTAIL_CHECK_START("ttail init checks", "logfile init checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_init_empty_logfilename);
+	TTAIL_ADD_TEST(test_init_nonexist_logfilename);
+	TTAIL_ADD_TEST(test_init_exist_logfilename);
+	TTAIL_ADD_TEST(test_init_same_exist_logfilename);
+	TTAIL_ADD_TEST(test_init_same_nonexist_logfilename);
+	TTAIL_ADD_TEST(test_init_multiple_logfilename);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_init_norm_dates.c

@@ -174,25 +174,12 @@ START_TEST (test_norm_dates_flags_full)
 }
 END_TEST
 
+TTAIL_CHECK_START("ttail init checks", "ttail_init_check() checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_norm_dates_flags_none);
+	TTAIL_ADD_TEST(test_norm_dates_flags_min);
+	TTAIL_ADD_TEST(test_norm_dates_flags_max);
+	TTAIL_ADD_TEST(test_norm_dates_flags_both);
+	TTAIL_ADD_TEST(test_norm_dates_flags_full);
+TTAIL_CHECK_END
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_norm_dates;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_norm_dates = tcase_create("ttail_init_check() checks");
-	tcase_add_checked_fixture(tc_init_norm_dates,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_norm_dates, test_norm_dates_flags_none);
-	tcase_add_test(tc_init_norm_dates, test_norm_dates_flags_min);
-	tcase_add_test(tc_init_norm_dates, test_norm_dates_flags_max);
-	tcase_add_test(tc_init_norm_dates, test_norm_dates_flags_both);
-	tcase_add_test(tc_init_norm_dates, test_norm_dates_flags_full);
-
-	suite_add_tcase(s, tc_init_norm_dates);
-	return s;
-}
-
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_init_re_prefix.c

@@ -53,23 +53,11 @@ START_TEST (test_init_againbad_prefix)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_prefix;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_prefix = tcase_create("date prefix regex init checks");
-	tcase_add_checked_fixture(tc_init_prefix,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_prefix, test_init_prefix);
-	tcase_add_test(tc_init_prefix, test_init_bad_prefix);
-	tcase_add_test(tc_init_prefix, test_init_again_prefix);
-	tcase_add_test(tc_init_prefix, test_init_againbad_prefix);
-
-	suite_add_tcase(s, tc_init_prefix);
-	return s;
-}
+TTAIL_CHECK_START("ttail init checks", "date prefix regex init checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_init_prefix);
+	TTAIL_ADD_TEST(test_init_bad_prefix);
+	TTAIL_ADD_TEST(test_init_again_prefix);
+	TTAIL_ADD_TEST(test_init_againbad_prefix);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_init_set_dates.c

@@ -142,23 +142,11 @@ START_TEST (test_init_setdates_nofmt_both)
 }
 END_TEST
 
-Suite * ttail_init_suite(void)
-{
-	Suite *s;
-	TCase	*tc_init_set_dates;
-
-	s = suite_create("ttail init checks");
-
-	tc_init_set_dates = tcase_create("dates min/max init checks");
-	tcase_add_checked_fixture(tc_init_set_dates,
-		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_set_dates, test_init_setdates_nothing);
-	tcase_add_test(tc_init_set_dates, test_init_setdates_nofmt_min);
-	tcase_add_test(tc_init_set_dates, test_init_setdates_nofmt_max);
-	tcase_add_test(tc_init_set_dates, test_init_setdates_nofmt_both);
-
-	suite_add_tcase(s, tc_init_set_dates);
-	return s;
-}
+TTAIL_CHECK_START("ttail init checks", "dates min/max init checks")
+	TTAIL_SET_FIXTURE(setup_ttail_empty, teardown_ttail);
+	TTAIL_ADD_TEST(test_init_setdates_nothing);
+	TTAIL_ADD_TEST(test_init_setdates_nofmt_min);
+	TTAIL_ADD_TEST(test_init_setdates_nofmt_max);
+	TTAIL_ADD_TEST(test_init_setdates_nofmt_both);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_init_suite)

tests/ttail_search_closest_fileinit.c

@@ -49,25 +49,11 @@ START_TEST (test_search_closest_init_vfile)
 }
 END_TEST
 
-Suite * ttail_search_files_suite(void)
-{
-	Suite *s;
-	TCase *tc_search_closest_fileinit;
-
-	s = suite_create("ttail search_files checks");
-
-	tc_search_closest_fileinit = tcase_create("\
-ttail_logline_closest_files_init() checks");
-	tcase_add_checked_fixture(tc_search_closest_fileinit,
-		setup_closest_fileinit, teardown_closest_fileinit);
-	tcase_add_test(tc_search_closest_fileinit, test_search_closest_init);
-	tcase_add_test(tc_search_closest_fileinit,
-		test_search_closest_init_filesz);
-	tcase_add_test(tc_search_closest_fileinit,
-		test_search_closest_init_vfile);
-
-	suite_add_tcase(s, tc_search_closest_fileinit);
-	return s;
-}
+TTAIL_CHECK_START(	"ttail search_files checks",\
+			"ttail_logline_closest_files_init() checks")
+	TTAIL_SET_FIXTURE(setup_closest_fileinit, teardown_closest_fileinit);
+	TTAIL_ADD_TEST(test_search_closest_init);
+	TTAIL_ADD_TEST(test_search_closest_init_filesz);
+	TTAIL_ADD_TEST(test_search_closest_init_vfile);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_search_files_suite)

tests/ttail_search_file_line.c

@@ -56,21 +56,9 @@ START_TEST (test_file_line_start)
 }
 END_TEST
 
-Suite * ttail_search_files_suite(void)
-{
-	Suite *s;
-	TCase *tc_file_line;
-
-	s = suite_create("ttail search_files checks");
-
-	tc_file_line = tcase_create("ttail_file_*line*() checks");
-	tcase_add_checked_fixture(tc_file_line,
-		setup_file_line, teardown_file_line);
-	tcase_add_test(tc_file_line, test_file_line_next);
-	tcase_add_test(tc_file_line, test_file_line_start);
-
-	suite_add_tcase(s, tc_file_line);
-	return s;
-}
+TTAIL_CHECK_START("ttail search_files checks", "ttail_file_*line*() checks")
+	TTAIL_SET_FIXTURE(setup_file_line, teardown_file_line);
+	TTAIL_ADD_TEST(test_file_line_next);
+	TTAIL_ADD_TEST(test_file_line_start);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_search_files_suite)

tests/ttail_search_files.c

@@ -106,22 +106,10 @@ START_TEST (test_search_files3)
 }
 END_TEST
 
-Suite * ttail_search_files_suite(void)
-{
-	Suite *s;
-	TCase *tc_search_files;
-
-	s = suite_create("ttail search_files checks");
-
-	tc_search_files = tcase_create("ttail_logline2date() checks");
-	tcase_add_checked_fixture(tc_search_files,
-		setup_closest_fileinit, teardown_closest_fileinit);
-	tcase_add_test(tc_search_files, test_search_files1);
-	tcase_add_test(tc_search_files, test_search_files2);
-	tcase_add_test(tc_search_files, test_search_files3);
-	
-	suite_add_tcase(s, tc_search_files);
-	return s;
-}
+TTAIL_CHECK_START("ttail search_files checks", "ttail_logline2date() checks")
+	TTAIL_SET_FIXTURE(setup_closest_fileinit, teardown_closest_fileinit);
+	TTAIL_ADD_TEST(test_search_files1);
+	TTAIL_ADD_TEST(test_search_files2);
+	TTAIL_ADD_TEST(test_search_files3);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_search_files_suite)

tests/ttail_search_logline2date.c

@@ -67,22 +67,10 @@ START_TEST (test_search_log2date_faildate)
 }
 END_TEST
 
-Suite * ttail_search_files_suite(void)
-{
-	Suite *s;
-	TCase *tc_search_logline2date;
-
-	s = suite_create("ttail search_files checks");
-
-	tc_search_logline2date = tcase_create("ttail_logline2date() checks");
-	tcase_add_checked_fixture(tc_search_logline2date,
-		setup_closest_fileinit, teardown_closest_fileinit);
-	tcase_add_test(tc_search_logline2date, test_search_log2date1);
-	tcase_add_test(tc_search_logline2date, test_search_log2date_failpref);
-	tcase_add_test(tc_search_logline2date, test_search_log2date_faildate);
-
-	suite_add_tcase(s, tc_search_logline2date);
-	return s;
-}
+TTAIL_CHECK_START("ttail search_files checks","ttail_logline2date() checks")
+	TTAIL_SET_FIXTURE(setup_closest_fileinit, teardown_closest_fileinit);
+	TTAIL_ADD_TEST(test_search_log2date1);
+	TTAIL_ADD_TEST(test_search_log2date_failpref);
+	TTAIL_ADD_TEST(test_search_log2date_faildate);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_search_files_suite)

tests/ttail_search_minmax.c

@@ -33,20 +33,8 @@ START_TEST (test_file_minmax1)
 }
 END_TEST
 
-Suite * ttail_search_files_suite(void)
-{
-	Suite *s;
-	TCase *tc_file_minmax;
-
-	s = suite_create("ttail search_files checks");
-
-	tc_file_minmax = tcase_create("ttail_file_minmax() checks");
-	tcase_add_checked_fixture(tc_file_minmax,
-		setup_closest_fileinit, teardown_closest_fileinit);
-	tcase_add_test(tc_file_minmax, test_file_minmax1);
-
-	suite_add_tcase(s, tc_file_minmax);
-	return s;
-}
+TTAIL_CHECK_START("ttail search_files checks", "ttail_file_minmax() checks")
+	TTAIL_SET_FIXTURE(setup_closest_fileinit, teardown_closest_fileinit);
+	TTAIL_ADD_TEST(test_file_minmax1);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_search_files_suite)

tests/ttail_search_subst.c

@@ -76,24 +76,12 @@ START_TEST (test_search_subst_re_nomatch)
 }
 END_TEST
 
-Suite * ttail_search_files_suite(void)
-{
-	Suite *s;
-	TCase *tc_search_subst;
-
-	s = suite_create("ttail search_files checks");
-
-	tc_search_subst = tcase_create("ttail_logline_subst() checks");
-	tcase_add_checked_fixture(tc_search_subst,
-		setup_closest_fileinit, teardown_closest_fileinit);
-	tcase_add_test(tc_search_subst, test_search_subst_const1);
-	tcase_add_test(tc_search_subst, test_search_subst_const2);
-	tcase_add_test(tc_search_subst, test_search_subst_re1);
-	tcase_add_test(tc_search_subst, test_search_subst_re2);
-	tcase_add_test(tc_search_subst, test_search_subst_re_nomatch);
-
-	suite_add_tcase(s, tc_search_subst);
-	return s;
-}
+TTAIL_CHECK_START("ttail search_files checks", "ttail_logline_subst() checks")
+	TTAIL_SET_FIXTURE(setup_closest_fileinit, teardown_closest_fileinit);
+	TTAIL_ADD_TEST(test_search_subst_const1);
+	TTAIL_ADD_TEST(test_search_subst_const2);
+	TTAIL_ADD_TEST(test_search_subst_re1);
+	TTAIL_ADD_TEST(test_search_subst_re2);
+	TTAIL_ADD_TEST(test_search_subst_re_nomatch);
+TTAIL_CHECK_END
 
-TTAIL_CHECK_MAIN(ttail_search_files_suite)