[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 01:25:55 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 3504bd0e29ba9b900be295924bab98a4264b3d0c
Author: Török Edvin <edwin at clamav.net>
Date: Wed Mar 24 16:25:57 2010 +0200
Run check_clamav under valgrind too to actually detect the leaks.
One leak remaining for IntConstants.
diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index cd931d8..61edaa6 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -552,6 +552,7 @@ libllvmjit_la_SOURCES=\
llvm/lib/VMCore/Instructions.cpp\
llvm/lib/VMCore/IntrinsicInst.cpp\
llvm/lib/VMCore/LLVMContext.cpp\
+ llvm/lib/VMCore/LLVMContextImpl.cpp\
llvm/lib/VMCore/LeakDetector.cpp\
llvm/lib/VMCore/Metadata.cpp\
llvm/lib/VMCore/Module.cpp\
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 9422aa1..b73834f 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -302,10 +302,10 @@ am_libllvmjit_la_OBJECTS = AliasAnalysis.lo BasicAliasAnalysis.lo \
AutoUpgrade.lo BasicBlock.lo ConstantFold.lo Constants.lo \
Core.lo Dominators.lo Function.lo GVMaterializer.lo Globals.lo \
IRBuilder.lo InlineAsm.lo Instruction.lo Instructions.lo \
- IntrinsicInst.lo LLVMContext.lo LeakDetector.lo Metadata.lo \
- Module.lo Pass.lo PassManager.lo PrintModulePass.lo Type.lo \
- TypeSymbolTable.lo Use.lo Value.lo ValueSymbolTable.lo \
- ValueTypes.lo Verifier.lo
+ IntrinsicInst.lo LLVMContext.lo LLVMContextImpl.lo \
+ LeakDetector.lo Metadata.lo Module.lo Pass.lo PassManager.lo \
+ PrintModulePass.lo Type.lo TypeSymbolTable.lo Use.lo Value.lo \
+ ValueSymbolTable.lo ValueTypes.lo Verifier.lo
libllvmjit_la_OBJECTS = $(am_libllvmjit_la_OBJECTS)
libllvmpowerpccodegen_la_LIBADD =
am__libllvmpowerpccodegen_la_SOURCES_DIST = \
@@ -1322,6 +1322,7 @@ libllvmjit_la_SOURCES = \
llvm/lib/VMCore/Instructions.cpp\
llvm/lib/VMCore/IntrinsicInst.cpp\
llvm/lib/VMCore/LLVMContext.cpp\
+ llvm/lib/VMCore/LLVMContextImpl.cpp\
llvm/lib/VMCore/LeakDetector.cpp\
llvm/lib/VMCore/Metadata.cpp\
llvm/lib/VMCore/Module.cpp\
@@ -1881,6 +1882,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LLLexer.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LLParser.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LLVMContext.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LLVMContextImpl.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LLVMTargetMachine.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LatencyPriorityQueue.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LeakDetector.Plo at am__quote@
@@ -4680,6 +4682,14 @@ LLVMContext.lo: llvm/lib/VMCore/LLVMContext.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o LLVMContext.lo `test -f 'llvm/lib/VMCore/LLVMContext.cpp' || echo '$(srcdir)/'`llvm/lib/VMCore/LLVMContext.cpp
+LLVMContextImpl.lo: llvm/lib/VMCore/LLVMContextImpl.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT LLVMContextImpl.lo -MD -MP -MF $(DEPDIR)/LLVMContextImpl.Tpo -c -o LLVMContextImpl.lo `test -f 'llvm/lib/VMCore/LLVMContextImpl.cpp' || echo '$(srcdir)/'`llvm/lib/VMCore/LLVMContextImpl.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LLVMContextImpl.Tpo $(DEPDIR)/LLVMContextImpl.Plo
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='llvm/lib/VMCore/LLVMContextImpl.cpp' object='LLVMContextImpl.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o LLVMContextImpl.lo `test -f 'llvm/lib/VMCore/LLVMContextImpl.cpp' || echo '$(srcdir)/'`llvm/lib/VMCore/LLVMContextImpl.cpp
+
LeakDetector.lo: llvm/lib/VMCore/LeakDetector.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT LeakDetector.lo -MD -MP -MF $(DEPDIR)/LeakDetector.Tpo -c -o LeakDetector.lo `test -f 'llvm/lib/VMCore/LeakDetector.cpp' || echo '$(srcdir)/'`llvm/lib/VMCore/LeakDetector.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/LeakDetector.Tpo $(DEPDIR)/LeakDetector.Plo
diff --git a/unit_tests/Makefile.am b/unit_tests/Makefile.am
index b6fa52e..925b06b 100644
--- a/unit_tests/Makefile.am
+++ b/unit_tests/Makefile.am
@@ -1,6 +1,7 @@
SPLIT_DIR=$(top_srcdir)/unit_tests/.split
FILES = clam-phish-exe
+check_unit_vg.sh: $(FILES) check_clamav
check2_clamd.sh: $(FILES)
check3_clamd.sh: $(FILES)
check4_clamd.sh: $(FILES)
@@ -15,7 +16,7 @@ $(FILES) :
cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@
programs = check_clamav
-scripts = check_freshclam.sh check_sigtool.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\
+scripts = check_freshclam.sh check_sigtool.sh check_unit_vg.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\
check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh
TESTS_ENVIRONMENT=export abs_srcdir=$(abs_srcdir) AWK=$(AWK);
if ENABLE_UNRAR
diff --git a/unit_tests/Makefile.in b/unit_tests/Makefile.in
index 2aa0f2b..3eba7cd 100644
--- a/unit_tests/Makefile.in
+++ b/unit_tests/Makefile.in
@@ -366,7 +366,7 @@ top_srcdir = @top_srcdir@
SPLIT_DIR = $(top_srcdir)/unit_tests/.split
FILES = clam-phish-exe
programs = check_clamav
-scripts = check_freshclam.sh check_sigtool.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\
+scripts = check_freshclam.sh check_sigtool.sh check_unit_vg.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\
check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh
TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK); \
@@ -893,6 +893,8 @@ check_freshclam.sh.log: check_freshclam.sh
@p='check_freshclam.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
check_sigtool.sh.log: check_sigtool.sh
@p='check_sigtool.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+check_unit_vg.sh.log: check_unit_vg.sh
+ @p='check_unit_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
check1_clamscan.sh.log: check1_clamscan.sh
@p='check1_clamscan.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
check2_clamd.sh.log: check2_clamd.sh
@@ -1070,6 +1072,7 @@ uninstall-am:
recheck recheck-html tags uninstall uninstall-am
+check_unit_vg.sh: $(FILES) check_clamav
check2_clamd.sh: $(FILES)
check3_clamd.sh: $(FILES)
check4_clamd.sh: $(FILES)
diff --git a/unit_tests/check_unit_vg.sh b/unit_tests/check_unit_vg.sh
index 66f9ebb..cb79bda 100755
--- a/unit_tests/check_unit_vg.sh
+++ b/unit_tests/check_unit_vg.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
+#!/bin/sh -x
. $srcdir/check_common.sh
init_valgrind
-CK_FORK=no WRAPPER="$VALGRIND $VALGRIND_FLAGS" ./check_clamav
+CK_FORK=no WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_run 0 $TOP/unit_tests/check_clamav
end_valgrind
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list