[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

Török Edvin edwin at clamav.net
Sun Apr 4 00:58:26 UTC 2010 

The following commit has been merged in the debian/unstable branch:
commit d99c0c4245d4a34459611576e08aa43a590f0e4c
Author: Török Edvin <edwin at clamav.net>
Date:   Mon Jul 13 19:34:12 2009 +0300

    bytecode: add unit tests and ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index c3dee83..4c6af1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 13 19:34:36 EEST 2009 (edwin)
+-------------------------------------
+ * clambc/, libclamav/, unit_tests/: Initial draft of bytecode interpreter (bb #1243).
+
 Mon Jul 13 16:06:31 CEST 2009 (tk)
 ----------------------------------
  * libclamav/macho.c: handle LC_THREAD; calculate EP
diff --git a/unit_tests/Makefile.am b/unit_tests/Makefile.am
index 49a61dd..8d5f956 100644
--- a/unit_tests/Makefile.am
+++ b/unit_tests/Makefile.am
@@ -22,7 +22,7 @@ if HAVE_LIBCHECK
 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_htmlnorm.c check_bytecode.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
diff --git a/unit_tests/Makefile.in b/unit_tests/Makefile.in
index b11c90f..441c9c8 100644
--- a/unit_tests/Makefile.in
+++ b/unit_tests/Makefile.in
@@ -56,7 +56,8 @@ am__EXEEXT_1 = check_clamav$(EXEEXT)
 am__check_clamav_SOURCES_DIST = check_clamav_skip.c 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_uniq.c check_matchers.c check_htmlnorm.c \
+	check_bytecode.c
 @HAVE_LIBCHECK_FALSE at am_check_clamav_OBJECTS =  \
 @HAVE_LIBCHECK_FALSE@	check_clamav-check_clamav_skip.$(OBJEXT)
 @HAVE_LIBCHECK_TRUE at am_check_clamav_OBJECTS =  \
@@ -67,7 +68,8 @@ am__check_clamav_SOURCES_DIST = check_clamav_skip.c check_clamav.c \
 @HAVE_LIBCHECK_TRUE@	check_clamav-check_disasm.$(OBJEXT) \
 @HAVE_LIBCHECK_TRUE@	check_clamav-check_uniq.$(OBJEXT) \
 @HAVE_LIBCHECK_TRUE@	check_clamav-check_matchers.$(OBJEXT) \
- at HAVE_LIBCHECK_TRUE@	check_clamav-check_htmlnorm.$(OBJEXT)
+ at HAVE_LIBCHECK_TRUE@	check_clamav-check_htmlnorm.$(OBJEXT) \
+ at HAVE_LIBCHECK_TRUE@	check_clamav-check_bytecode.$(OBJEXT)
 check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)
 @HAVE_LIBCHECK_TRUE at check_clamav_DEPENDENCIES =  \
 @HAVE_LIBCHECK_TRUE@	$(top_builddir)/libclamav/libclamav.la
@@ -265,7 +267,7 @@ check_SCRIPTS = $(scripts)
 @HAVE_LIBCHECK_TRUE at 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\
- at HAVE_LIBCHECK_TRUE@		       check_htmlnorm.c
+ at HAVE_LIBCHECK_TRUE@		       check_htmlnorm.c check_bytecode.c
 
 @HAVE_LIBCHECK_TRUE at check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"
 @HAVE_LIBCHECK_TRUE at check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@
@@ -334,6 +336,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/check_clamav-check_bytecode.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/check_clamav-check_clamav.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/check_clamav-check_clamav_skip.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/check_clamav-check_disasm.Po at am__quote@
@@ -493,6 +496,20 @@ 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_clamav-check_bytecode.o: check_bytecode.c
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_bytecode.o -MD -MP -MF $(DEPDIR)/check_clamav-check_bytecode.Tpo -c -o check_clamav-check_bytecode.o `test -f 'check_bytecode.c' || echo '$(srcdir)/'`check_bytecode.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamav-check_bytecode.Tpo $(DEPDIR)/check_clamav-check_bytecode.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_bytecode.c' object='check_clamav-check_bytecode.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_bytecode.o `test -f 'check_bytecode.c' || echo '$(srcdir)/'`check_bytecode.c
+
+check_clamav-check_bytecode.obj: check_bytecode.c
+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_clamav-check_bytecode.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_bytecode.Tpo -c -o check_clamav-check_bytecode.obj `if test -f 'check_bytecode.c'; then $(CYGPATH_W) 'check_bytecode.c'; else $(CYGPATH_W) '$(srcdir)/check_bytecode.c'; fi`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamav-check_bytecode.Tpo $(DEPDIR)/check_clamav-check_bytecode.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_bytecode.c' object='check_clamav-check_bytecode.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_clamav_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_clamav-check_bytecode.obj `if test -f 'check_bytecode.c'; then $(CYGPATH_W) 'check_bytecode.c'; else $(CYGPATH_W) '$(srcdir)/check_bytecode.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
diff --git a/unit_tests/check_clamav.c b/unit_tests/check_clamav.c
index fd549e3..52d9f3c 100644
--- a/unit_tests/check_clamav.c
+++ b/unit_tests/check_clamav.c
@@ -534,6 +534,7 @@ int main(void)
     srunner_add_suite(sr, test_uniq_suite());
     srunner_add_suite(sr, test_matchers_suite());
     srunner_add_suite(sr, test_htmlnorm_suite());
+    srunner_add_suite(sr, test_bytecode_suite());
 
     srunner_set_log(sr, "test.log");
     if(freopen("test-stderr.log","w+",stderr) == NULL) {
diff --git a/unit_tests/checks.h b/unit_tests/checks.h
index ce62380..771a604 100644
--- a/unit_tests/checks.h
+++ b/unit_tests/checks.h
@@ -9,6 +9,7 @@ Suite *test_disasm_suite(void);
 Suite *test_uniq_suite(void);
 Suite *test_matchers_suite(void);
 Suite *test_htmlnorm_suite(void);
+Suite *test_bytecode_suite(void);
 void errmsg_expected(void);
 int open_testfile(const char *name);
 void diff_files(int fd, int reffd);

-- 
Debian repository for ClamAV

More information about the Pkg-clamav-commits mailing list