@@ -1,3 +1,9 @@

+Thu Jul 10 16:02:50 EEST 2008 (edwin)

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

+ * unit_tests/:

+	avoid misleading message when unit tests are disabled (bb #1090)

+	fix some compiler warnings

+

 Tue Jul  8 21:33:32 EEST 2008 (edwin)

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

   * libclamav/Makefile.am, libclamav/jsparse, unit_test/:

@@ -7,8 +7,9 @@

 #ifndef HAVE_CHECK

 int main(int argc, char **argv)

 {

-    printf("Unit tests disabled in build\n");

-    return 0;

+    puts("\n*** Unit tests disabled in this build\n*** Use ./configure --enable-check to enable them\n");

+    /* tell automake the test was skipped */

+    return 77;

 }

 #else

@@ -19,6 +20,7 @@ int main(int argc, char **argv)

 #include "../libclamav/clamav.h"

 #include "../libclamav/others.h"

 #include "../libclamav/matcher.h"

+#include "checks.h"

 /* extern void cl_free(struct cl_engine *engine); */

 START_TEST (test_cl_free)

@@ -307,7 +309,6 @@ int main(int argc, char **argv)

     srunner_run_all(sr, CK_NORMAL);

     nf = srunner_ntests_failed(sr);

     srunner_free(sr);

-

     return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;

 }

@@ -16,6 +16,7 @@

 #include "../libclamav/jsparse/textbuf.h"

 #include "../libclamav/jsparse/generated/keywords.h"

 #include "../libclamav/jsparse/generated/operators.h"

+#include "checks.h"

 struct test {

 	const char *str;

@@ -150,8 +151,6 @@ START_TEST (test_init_parse_destroy)

 }

 END_TEST

-

-Suite *test_jsnorm_suite(void);

 Suite *test_jsnorm_suite(void)

 {

     Suite *s = suite_create("jsnorm");

@@ -13,6 +13,7 @@

 #include "../libclamav/others.h"

 #include "../libclamav/str.h"

 #include "../libclamav/jsparse/textbuf.h"

+#include "checks.h"

 START_TEST (test_unescape_simple)

 {

@@ -120,7 +121,6 @@ START_TEST (test_normalize)

 }

 END_TEST

-Suite *test_str_suite(void);

 Suite *test_str_suite(void)

 {

     Suite *s = suite_create("str");

new file mode 100644

@@ -0,0 +1,5 @@

+#ifndef CHECKS_H

+#define CHECKS_H

+Suite *test_jsnorm_suite(void);

+Suite *test_str_suite(void);

+#endif