@@ -1,3 +1,7 @@

+Sun Aug 10 18:07:43 CEST 2008 (acab)

+------------------------------------

+  * unit_tests: check for check version

+

 Sun Aug 10 17:46:12 CEST 2008 (tk)

 ----------------------------------

   * freshclam/manager.c: add machine/OS info to the default user agent string

@@ -238,6 +238,7 @@ static void data_teardown(void)

 	free(data2);

 }

+#ifdef CHECK_HAVE_LOOPS

 /* test reading with different alignments, _i is parameter from tcase_add_loop_test */

 START_TEST (test_cli_readint16)

 {

@@ -307,6 +308,7 @@ static Suite *test_cli_suite(void)

     return s;

 }

+#endif

 void errmsg_expected(void)

 {

@@ -340,7 +342,9 @@ int main(int argc, char **argv)

     cl_debug();

     Suite *s = test_cl_suite();

     SRunner *sr = srunner_create(s);

+#ifdef CHECK_HAVE_LOOPS

     srunner_add_suite(sr, test_cli_suite());

+#endif

     srunner_add_suite(sr, test_jsnorm_suite());

     srunner_add_suite(sr, test_str_suite());

     srunner_add_suite(sr, test_regex_suite());

@@ -60,6 +60,7 @@ static struct test op_test[] = {

 	{"---",0}

 };

+#ifdef CHECK_HAVE_LOOPS

 START_TEST (test_keywords)

 {

     const struct keyword *kw = in_word_set(kw_test[_i].str, strlen(kw_test[_i].str));

@@ -80,6 +81,7 @@ START_TEST (test_operators)

 	    fail_unless(!op, "non-operator detected as operator");

 }

 END_TEST

+#endif

 START_TEST (test_token_string)

 {

@@ -401,6 +403,7 @@ static struct {

 	{jstest_buf12, jstest_expected12}

 };

+#ifdef CHECK_HAVE_LOOPS

 START_TEST (tokenizer_basic)

 {

 	tokenizer_test(js_tests[_i].in, js_tests[_i].expected, 0);

@@ -412,6 +415,7 @@ START_TEST (tokenizer_split)

 	tokenizer_test(js_tests[_i].in, js_tests[_i].expected, 1);

 }

 END_TEST

+#endif

 START_TEST (js_buffer)

 {

@@ -458,9 +462,10 @@ Suite *test_jsnorm_suite(void)

     tc_jsnorm_gperf = tcase_create("jsnorm gperf");

     suite_add_tcase (s, tc_jsnorm_gperf);

+#ifdef CHECK_HAVE_LOOPS

     tcase_add_loop_test(tc_jsnorm_gperf, test_keywords, 0, sizeof(kw_test)/sizeof(kw_test[0]));

     tcase_add_loop_test(tc_jsnorm_gperf, test_operators, 0, sizeof(op_test)/sizeof(op_test[0]));

-

+#endif

     tc_jsnorm_token = tcase_create("jsnorm token functions");

     suite_add_tcase (s, tc_jsnorm_token);

     tcase_add_test(tc_jsnorm_token, test_token_string);

@@ -477,8 +482,10 @@ Suite *test_jsnorm_suite(void)

     tc_jsnorm_tokenizer = tcase_create("jsnorm tokenizer");

     suite_add_tcase (s, tc_jsnorm_tokenizer);

     tcase_add_checked_fixture (tc_jsnorm_tokenizer, jstest_setup, jstest_teardown);

+#ifdef CHECK_HAVE_LOOPS

     tcase_add_loop_test(tc_jsnorm_tokenizer, tokenizer_basic, 0, sizeof(js_tests)/sizeof(js_tests[0]));

     tcase_add_loop_test(tc_jsnorm_tokenizer, tokenizer_split, 0, sizeof(js_tests)/sizeof(js_tests[0]));

+#endif

     tcase_add_test(tc_jsnorm_tokenizer, js_buffer);

     tc_jsnorm_bugs = tcase_create("jsnorm bugs");

@@ -117,6 +117,7 @@ static int cb_expect_multi(void *cbdata, const char *suffix, size_t len, const s

 	return 0;

 }

+#ifdef CHECK_HAVE_LOOPS

 START_TEST (test_suffix)

 {

 	int rc;

@@ -138,6 +139,7 @@ START_TEST (test_suffix)

 			"suffix number mismatch, expected: %d, was: %d\n", n, cb_called);

 }

 END_TEST

+#endif

 static void setup(void)

 {

@@ -217,6 +219,7 @@ static const struct rtest {

 	{NULL,"http://key.com%00fake.example.com","https://key.com",0},

 };

+#ifdef CHECK_HAVE_LOOPS

 START_TEST (regex_list_match_test)

 {

 	const char *info;

@@ -260,6 +263,7 @@ START_TEST (regex_list_match_test)

 	free(realurl);

 }

 END_TEST

+#endif

 static struct cl_engine *engine;

 static int loaded_2 = 0;

@@ -400,12 +404,13 @@ static void do_phishing_test(const struct rtest *rtest)

 	}

 }

+#ifdef CHECK_HAVE_LOOPS

 START_TEST (phishingScan_test)

 {

 	do_phishing_test(&rtests[_i]);

 }

 END_TEST

-

+#endif

 START_TEST(phishing_fake_test)

 {

@@ -438,24 +443,30 @@ Suite *test_regex_suite(void)

 	tcase_add_checked_fixture (tc_api, setup, teardown);

 	tcase_add_test(tc_api, empty);

 	tcase_add_test(tc_api, one);

+#ifdef CHECK_HAVE_LOOPS

 	tcase_add_loop_test(tc_api, test_suffix, 0, sizeof(tests)/sizeof(tests[0]));

-

+#endif

 	tc_matching = tcase_create("regex_list");

 	suite_add_tcase(s, tc_matching);

 	tcase_add_checked_fixture (tc_matching, rsetup, rteardown);

+#ifdef CHECK_HAVE_LOOPS

 	tcase_add_loop_test(tc_matching, regex_list_match_test, 0, sizeof(rtests)/sizeof(rtests[0]));

-

+#endif

 	tc_phish = tcase_create("phishingScan");

 	suite_add_tcase(s, tc_phish);

 	tcase_add_checked_fixture(tc_phish, psetup, pteardown);

+#ifdef CHECK_HAVE_LOOPS

 	tcase_add_loop_test(tc_phish, phishingScan_test, 0, sizeof(rtests)/sizeof(rtests[0]));

+#endif

 	tcase_add_test(tc_phish, phishing_fake_test);

 	tc_phish2 = tcase_create("phishingScan with 2 dbs");

 	suite_add_tcase(s, tc_phish2);

 	tcase_add_checked_fixture(tc_phish2, psetup2, pteardown);

+#ifdef CHECK_HAVE_LOOPS

 	tcase_add_loop_test(tc_phish2, phishingScan_test, 0, sizeof(rtests)/sizeof(rtests[0]));

+#endif

 	tcase_add_test(tc_phish2, phishing_fake_test);

 	return s;

@@ -1,5 +1,9 @@

 #ifndef CHECKS_H

 #define CHECKS_H

+

+#if CHECK_MAJOR_VERSION > 0 || ( CHECK_MINOR_VERSION > 9 || ( CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 3))

+#define CHECK_HAVE_LOOPS

+#endif

 Suite *test_jsnorm_suite(void);

 Suite *test_str_suite(void);

 Suite *test_regex_suite(void);