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

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 5167de752a67d8cb7cf5cf94529137f1955e7b30
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Dec 11 18:09:45 2009 +0200

    Disable LLVM's make check for now.
    
    See the comments in Makefile.am for what needs to be done before this can be
    enabled in master.

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index c8cea22..72dd9f0 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -742,7 +742,11 @@ FileCheck_SOURCES=llvm/utils/FileCheck/FileCheck.cpp
 
 check_LTLIBRARIES=libllvmbitreader.la libllvmasmprinter.la libllvmbitwriter.la libllvmasmparser.la libgoogletest.la libllvminterpreter.la
 check_PROGRAMS=count not lli llc llvm-as llvm-dis llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT FileCheck
-check_SCRIPTS=llvmdejagnu.sh
+# Disable LLVM make check for now, there are some things to fix first:
+#   - check python version (2.4 doesn't work, needs 2.5+)
+#   - run llvm's make check after clamav's was run
+#   - have a way to run only clamav's make check and not llvm's
+#check_SCRIPTS=llvmdejagnu.sh
 TESTS_ENVIRONMENT=export GMAKE=@GMAKE@;
 TESTS=llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT
 @ifGNUmake@ TESTS+=llvmdejagnu.sh
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 7abf778..01078b3 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -1585,7 +1585,11 @@ FileCheck_CXXFLAGS = $(LLVM_CXXFLAGS)
 FileCheck_LDADD = libllvmsupport.la libllvmsystem.la 
 FileCheck_SOURCES = llvm/utils/FileCheck/FileCheck.cpp
 check_LTLIBRARIES = libllvmbitreader.la libllvmasmprinter.la libllvmbitwriter.la libllvmasmparser.la libgoogletest.la libllvminterpreter.la
-check_SCRIPTS = llvmdejagnu.sh
+# Disable LLVM make check for now, there are some things to fix first:
+#   - check python version (2.4 doesn't work, needs 2.5+)
+#   - run llvm's make check after clamav's was run
+#   - have a way to run only clamav's make check and not llvm's
+#check_SCRIPTS=llvmdejagnu.sh
 TESTS_ENVIRONMENT = export GMAKE=@GMAKE@;
 libllvmasmprinter_la_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS) -I$(top_srcdir)/llvm/lib/Target/X86 \
 			      -I$(top_srcdir)/llvm/lib/Target/PowerPC -I$(top_srcdir)/llvm/lib/Target/ARM
@@ -6405,8 +6409,7 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \
-	  $(check_SCRIPTS)
+	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am

-- 
Debian repository for ClamAV