[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 c22a7a16d6a0cd3d6ad672b14266301803d58bdb
Author: Török Edvin <edwin at clamav.net>
Date:   Sat Dec 12 12:19:40 2009 +0200

    Really disable LLVM unit tests (for now).

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index 928a0c7..667c5a1 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -742,14 +742,14 @@ 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
+TESTS_ENVIRONMENT=export GMAKE=@GMAKE@;
+TESTS=llvmunittest_ADT llvmunittest_Support llvmunittest_VMCore llvmunittest_ExecutionEngine llvmunittest_JIT
 # 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
- at ifGNUmake@ TESTS+=llvmdejagnu.sh
+#@ifGNUmake@ TESTS+=llvmdejagnu.sh
 
 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
diff --git a/libclamav/c++/Makefile.in b/libclamav/c++/Makefile.in
index 329e7bc..a9e7680 100644
--- a/libclamav/c++/Makefile.in
+++ b/libclamav/c++/Makefile.in
@@ -1585,12 +1585,13 @@ 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
+TESTS_ENVIRONMENT = export GMAKE=@GMAKE@;
 # 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@;
+#@ifGNUmake@ TESTS+=llvmdejagnu.sh
 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
 
@@ -6409,7 +6410,8 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \
+	  $(check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
@@ -6635,7 +6637,6 @@ llvm/include/llvm/Intrinsics.gen: llvm/include/llvm/Intrinsics.td $(TBLGEN)
 
 @BUILD_ARM_TRUE at ARMGenSubtarget.inc: llvm/lib/Target/ARM/ARM.td $(TBLGEN)
 @BUILD_ARM_TRUE@	$(TBLGEN_V) $(TBLGEN_FLAGS_ARM) -gen-subtarget -o $@ $<
- at ifGNUmake@ TESTS+=llvmdejagnu.sh
 #bytecode2llvm.cpp: build-llvm
 
 build-llvm:

-- 
Debian repository for ClamAV