@@ -1,3 +1,10 @@

+Thu Feb 12 17:11:16 EET 2009 (edwin)

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

+ * Makefile.in, unit_tests/Makefile.am, unit_tests/Makefile.in,

+ unit_tests/check_clamd.c, unit_tests/check_clamd.sh,

+ unit_tests/checks.h, unit_tests/checks_common.h: initial version of

+ clamd proto tests

+

 Thu Feb 12 14:15:14 EET 2009 (edwin)

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

  * clamd/session.c: actually use the flags we calculated!

@@ -66,7 +66,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(top_srcdir)/docs/man/freshclam.1.in \

 	$(top_srcdir)/docs/man/freshclam.conf.5.in \

 	$(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \

-	INSTALL NEWS config/config.guess config/config.rpath \

+	INSTALL NEWS TODO config/config.guess config/config.rpath \

 	config/config.sub config/depcomp config/install-sh \

 	config/ltmain.sh config/missing

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

@@ -15,21 +15,25 @@ else

 TESTS_ENVIRONMENT += export unrar_disabled=1;

 endif

 TESTS = $(programs) $(scripts)

-check_PROGRAMS = $(programs)

+check_PROGRAMS = $(programs) check_clamd

 check_SCRIPTS = $(scripts)

 if HAVE_LIBCHECK

-check_clamav_SOURCES = check_clamav.c checks.h $(top_builddir)/libclamav/clamav.h\

+check_clamav_SOURCES = check_clamav.c checks.h checks_common.h $(top_builddir)/libclamav/clamav.h\

 		       check_jsnorm.c check_str.c check_regex.c\

 		       check_disasm.c check_uniq.c check_matchers.c\

 		       check_htmlnorm.c

 check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

+check_clamd_SOURCES = check_clamd.c checks_common.h

+check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

+check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@

 else

+check_clamd_SOURCES = check_clamav_skip.c

 check_clamav_SOURCES = check_clamav_skip.c

 endif

-check_clamd.sh: $(top_builddir)/test/clam.exe

+check_clamd.sh: $(top_builddir)/test/clam.exe check_clamd

 check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

@@ -34,7 +34,7 @@ host_triplet = @host@

 target_triplet = @target@

 @ENABLE_UNRAR_FALSE@am__append_1 = export unrar_disabled=1;

 TESTS = $(am__EXEEXT_1) $(scripts)

-check_PROGRAMS = $(am__EXEEXT_1)

+check_PROGRAMS = $(am__EXEEXT_1) check_clamd$(EXEEXT)

 subdir = unit_tests

 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

@@ -53,9 +53,9 @@ CONFIG_HEADER = $(top_builddir)/clamav-config.h

 CONFIG_CLEAN_FILES =

 am__EXEEXT_1 = check_clamav$(EXEEXT)

 am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \

-	checks.h $(top_builddir)/libclamav/clamav.h check_jsnorm.c \

-	check_str.c check_regex.c check_disasm.c check_uniq.c \

-	check_matchers.c check_htmlnorm.c

+	checks.h checks_common.h $(top_builddir)/libclamav/clamav.h \

+	check_jsnorm.c check_str.c check_regex.c check_disasm.c \

+	check_uniq.c check_matchers.c check_htmlnorm.c

 @HAVE_LIBCHECK_FALSE@am_check_clamav_OBJECTS =  \

 @HAVE_LIBCHECK_FALSE@	check_clamav-check_clamav_skip.$(OBJEXT)

 @HAVE_LIBCHECK_TRUE@am_check_clamav_OBJECTS =  \

@@ -70,6 +70,14 @@ am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \

 check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)

 @HAVE_LIBCHECK_TRUE@check_clamav_DEPENDENCIES =  \

 @HAVE_LIBCHECK_TRUE@	$(top_builddir)/libclamav/libclamav.la

+am__check_clamd_SOURCES_DIST = check_clamav_skip.c check_clamd.c \

+	checks_common.h

+@HAVE_LIBCHECK_FALSE@am_check_clamd_OBJECTS =  \

+@HAVE_LIBCHECK_FALSE@	check_clamd-check_clamav_skip.$(OBJEXT)

+@HAVE_LIBCHECK_TRUE@am_check_clamd_OBJECTS =  \

+@HAVE_LIBCHECK_TRUE@	check_clamd-check_clamd.$(OBJEXT)

+check_clamd_OBJECTS = $(am_check_clamd_OBJECTS)

+check_clamd_DEPENDENCIES =

 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

@@ -82,8 +90,9 @@ CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

 	$(LDFLAGS) -o $@

-SOURCES = $(check_clamav_SOURCES)

-DIST_SOURCES = $(am__check_clamav_SOURCES_DIST)

+SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES)

+DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \

+	$(am__check_clamd_SOURCES_DIST)

 ETAGS = etags

 CTAGS = ctags

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

@@ -253,13 +262,17 @@ TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK); \

 	$(am__append_1)

 check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c

-@HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c checks.h $(top_builddir)/libclamav/clamav.h\

+@HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c checks.h checks_common.h $(top_builddir)/libclamav/clamav.h\

 @HAVE_LIBCHECK_TRUE@		       check_jsnorm.c check_str.c check_regex.c\

 @HAVE_LIBCHECK_TRUE@		       check_disasm.c check_uniq.c check_matchers.c\

 @HAVE_LIBCHECK_TRUE@		       check_htmlnorm.c

 @HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 @HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

+@HAVE_LIBCHECK_FALSE@check_clamd_SOURCES = check_clamav_skip.c

+@HAVE_LIBCHECK_TRUE@check_clamd_SOURCES = check_clamd.c checks_common.h

+@HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

+@HAVE_LIBCHECK_TRUE@check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@

 CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log valgrind-*.log duma.log duma2.log clamscan2.log

 EXTRA_DIST = .split $(srcdir)/*.ref input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

@@ -311,6 +324,9 @@ clean-checkPROGRAMS:

 check_clamav$(EXEEXT): $(check_clamav_OBJECTS) $(check_clamav_DEPENDENCIES) 

 	@rm -f check_clamav$(EXEEXT)

 	$(LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS)

+check_clamd$(EXEEXT): $(check_clamd_OBJECTS) $(check_clamd_DEPENDENCIES) 

+	@rm -f check_clamd$(EXEEXT)

+	$(LINK) $(check_clamd_OBJECTS) $(check_clamd_LDADD) $(LIBS)

 mostlyclean-compile:

 	-rm -f *.$(OBJEXT)

@@ -327,6 +343,8 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_regex.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_str.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_uniq.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamd-check_clamav_skip.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamd-check_clamd.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -475,6 +493,34 @@ check_clamav-check_htmlnorm.obj: check_htmlnorm.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_htmlnorm.obj `if test -f 'check_htmlnorm.c'; then $(CYGPATH_W) 'check_htmlnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_htmlnorm.c'; fi`

+check_clamd-check_clamav_skip.o: check_clamav_skip.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamav_skip.o -MD -MP -MF $(DEPDIR)/check_clamd-check_clamav_skip.Tpo -c -o check_clamd-check_clamav_skip.o `test -f 'check_clamav_skip.c' || echo '$(srcdir)/'`check_clamav_skip.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamav_skip.Tpo $(DEPDIR)/check_clamd-check_clamav_skip.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamav_skip.c' object='check_clamd-check_clamav_skip.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamav_skip.o `test -f 'check_clamav_skip.c' || echo '$(srcdir)/'`check_clamav_skip.c

+

+check_clamd-check_clamav_skip.obj: check_clamav_skip.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamav_skip.obj -MD -MP -MF $(DEPDIR)/check_clamd-check_clamav_skip.Tpo -c -o check_clamd-check_clamav_skip.obj `if test -f 'check_clamav_skip.c'; then $(CYGPATH_W) 'check_clamav_skip.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav_skip.c'; fi`

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamav_skip.Tpo $(DEPDIR)/check_clamd-check_clamav_skip.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamav_skip.c' object='check_clamd-check_clamav_skip.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamav_skip.obj `if test -f 'check_clamav_skip.c'; then $(CYGPATH_W) 'check_clamav_skip.c'; else $(CYGPATH_W) '$(srcdir)/check_clamav_skip.c'; fi`

+

+check_clamd-check_clamd.o: check_clamd.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamd.o -MD -MP -MF $(DEPDIR)/check_clamd-check_clamd.Tpo -c -o check_clamd-check_clamd.o `test -f 'check_clamd.c' || echo '$(srcdir)/'`check_clamd.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamd.Tpo $(DEPDIR)/check_clamd-check_clamd.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamd.c' object='check_clamd-check_clamd.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamd.o `test -f 'check_clamd.c' || echo '$(srcdir)/'`check_clamd.c

+

+check_clamd-check_clamd.obj: check_clamd.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamd-check_clamd.obj -MD -MP -MF $(DEPDIR)/check_clamd-check_clamd.Tpo -c -o check_clamd-check_clamd.obj `if test -f 'check_clamd.c'; then $(CYGPATH_W) 'check_clamd.c'; else $(CYGPATH_W) '$(srcdir)/check_clamd.c'; fi`

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamd-check_clamd.Tpo $(DEPDIR)/check_clamd-check_clamd.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_clamd.c' object='check_clamd-check_clamd.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamd-check_clamd.obj `if test -f 'check_clamd.c'; then $(CYGPATH_W) 'check_clamd.c'; else $(CYGPATH_W) '$(srcdir)/check_clamd.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -740,7 +786,7 @@ check_clamd.sh: $(FILES)

 $(FILES) :

 	cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@

-check_clamd.sh: $(top_builddir)/test/clam.exe

+check_clamd.sh: $(top_builddir)/test/clam.exe check_clamd

 check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

new file mode 100644

@@ -0,0 +1,153 @@

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+#include <errno.h>

+#include <signal.h>

+#ifdef HAVE_SYS_TYPES_H

+#include <sys/types.h>

+#endif

+#include <sys/socket.h>

+#include <sys/un.h>

+#include <check.h>

+#include "checks_common.h"

+#include "libclamav/version.h"

+

+#ifdef CHECK_HAVE_LOOPS

+

+static int sockd;

+#define SOCKET "clamd-test.socket"

+static void conn_setup(void)

+{

+    int rc;

+    struct sockaddr_un nixsock;

+    memset((void *)&nixsock, 0, sizeof(nixsock));

+    nixsock.sun_family = AF_UNIX;

+    strncpy(nixsock.sun_path, SOCKET, sizeof(nixsock.sun_path));

+

+    sockd = socket(AF_UNIX, SOCK_STREAM, 0);

+    fail_unless_fmt(sockd != -1, "Unable to create socket: %s\n", strerror(errno));

+

+    rc = connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock));

+    fail_unless_fmt(rc != -1, "Unable to connect(): %s\n", strerror(errno));

+

+    signal(SIGPIPE, SIG_IGN);

+}

+

+static void conn_teardown(void)

+{

+    if (sockd != -1)

+	close(sockd);

+}

+

+#ifndef REPO_VERSION

+#define REPO_VERSION VERSION

+#endif

+static struct basic_test {

+    const char *command;

+    const char *reply;

+} basic_tests[] = {

+    {"PING", "PONG"},

+    {"RELOAD","RELOADING"},

+    {"VERSION", "ClamAV "REPO_VERSION""VERSION_SUFFIX}

+};

+

+static void *recvfull(int sd, size_t *len)

+{

+    char *buf = NULL;

+    size_t off = 0;

+    int rc;

+

+    *len = 0;

+    do {

+       if (off + BUFSIZ > *len) {

+	    *len += BUFSIZ+1;

+	    buf = realloc(buf, *len);

+	    fail_unless(!!buf, "Cannot realloc buffer\n");

+	}

+

+	rc = recv(sd, buf + off, BUFSIZ, 0);

+	fail_unless_fmt(rc != -1, "recv() failed: %s\n", strerror(errno));

+	off += rc;

+    } while (rc);

+    buf[*len] = '\0';

+    *len = off;

+    return buf;

+}

+

+static void test_command(const char *cmd, size_t len, const char *expect, size_t expect_len)

+{

+    void *recvdata;

+    int rc;

+    rc = send(sockd, cmd, len, 0);

+    fail_unless_fmt(rc != -1, "Unable to send(): %s\n", strerror(errno));

+

+    recvdata = recvfull(sockd, &len);

+

+    fail_unless_fmt(len == expect_len, "Reply has wrong size: %lu, expected %lu, reply: %s\n",

+		    len, expect_len, recvdata);

+

+    rc = memcmp(recvdata, expect, expect_len);

+    fail_unless_fmt(!rc, "Wrong reply for command %s: |%s|, expected: |%s|\n", cmd, recvdata, expect);

+    free(recvdata);

+}

+

+START_TEST (test_basic_commands)

+{

+    int rc;

+    struct basic_test *test = &basic_tests[_i];

+    size_t len;

+    char nsend[BUFSIZ], nreply[BUFSIZ];

+    /* send the command the "old way" */

+    conn_setup();

+    snprintf(nreply, sizeof(nreply), "%s\n", test->reply);

+    test_command(test->command, strlen(test->command), nreply, strlen(nreply));

+    conn_teardown();

+

+    /* send nCOMMAND */

+    conn_setup();

+    snprintf(nsend, sizeof(nsend), "n%s\n", test->command);

+    test_command(nsend, strlen(nsend), nreply, strlen(nreply));

+    conn_teardown();

+

+    /* send zCOMMAND */

+    conn_setup();

+    snprintf(nsend, sizeof(nsend), "z%s\0", test->command);

+    test_command(nsend, strlen(nsend)+1, test->reply, strlen(test->reply)+1);

+    conn_teardown();

+}

+END_TEST

+

+static Suite *test_clamd_suite(void)

+{

+    Suite *s = suite_create("clamd");

+    TCase *tc_commands = tcase_create("clamd commands");

+    suite_add_tcase(s, tc_commands);

+    tcase_add_loop_test(tc_commands, test_basic_commands, 0, sizeof(basic_tests)/sizeof(basic_tests[0]));

+

+    return s;

+}

+

+int main(void)

+{

+    int nf;

+    Suite *s = test_clamd_suite();

+    SRunner *sr = srunner_create(s);

+    srunner_set_log(sr, "test-clamd.log");

+    srunner_run_all(sr, CK_NORMAL);

+    nf = srunner_ntests_failed(sr);

+    srunner_free(sr);

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

+}

+

+#else

+int main(void)

+{

+    puts("\n*** Check version too old, clamd tests not run!\n");

+    /* tell automake the test was skipped */

+    return 77;

+}

+#endif

@@ -89,6 +89,12 @@ run_clamdscan() {

 		cat clamdscan-multiscan.log

 		die 1

 	fi

+	$TOP/unit_tests/check_clamd

+	ecode=$?

+	if test $ecode -ne 77 && test $ecode -ne 0; then

+	    error "Failed clamd protocol test!"

+	    die 1

+	fi

 }

 run_reload_test()

@@ -1,18 +1,7 @@

 #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

-

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

-#define fail_unless_fmt fail_unless

-#define fail_fmt fail

-#else

-#define fail_unless_fmt(cond, msg, ...) fail_unless(cond, msg)

-#define fail_fmt(msg, ...) fail(msg)

-#endif

-

+#include "checks_common.h"

 Suite *test_jsnorm_suite(void);

 Suite *test_str_suite(void);

 Suite *test_regex_suite(void);

new file mode 100644

@@ -0,0 +1,16 @@

+#ifndef CHECKS_COMMON_H

+#define CHECKS_COMMON_H

+

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

+#define CHECK_HAVE_LOOPS

+#endif

+

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

+#define fail_unless_fmt fail_unless

+#define fail_fmt fail

+#else

+#define fail_unless_fmt(cond, msg, ...) fail_unless(cond, msg)

+#define fail_fmt(msg, ...) fail(msg)

+#endif

+

+#endif