[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 c5fb062ec3a22b2e35fca555cb59d4a5646fef2e
Author: Török Edvin <edwin at clamav.net>
Date:   Wed Mar 31 12:30:57 2010 +0300

    Workaround bb #1898.
    
    Solaris has 2 greps, one archaic that doesn't know -E and -F,
    and one that does. Configure finds the correct one, but
    'make check' was using the wrong one.
    This patch makes 'lit' substitute 'grep ' with the path to the
    correct grep.

diff --git a/libclamav/c++/llvm/test/CodeGen/ARM/private.ll b/libclamav/c++/llvm/test/CodeGen/ARM/private.ll
index fba56b4..d60ee3b 100644
--- a/libclamav/c++/llvm/test/CodeGen/ARM/private.ll
+++ b/libclamav/c++/llvm/test/CodeGen/ARM/private.ll
@@ -2,7 +2,7 @@
 ;
 ; RUN: llc < %s -mtriple=arm-linux-gnueabi > %t
 ; RUN: grep .Lfoo: %t
-; RUN: egrep bl.*\.Lfoo %t
+; RUN: grep -E bl.*\.Lfoo %t
 ; RUN: grep .Lbaz: %t
 ; RUN: grep long.*\.Lbaz %t
 
diff --git a/libclamav/c++/llvm/test/CodeGen/PowerPC/fma.ll b/libclamav/c++/llvm/test/CodeGen/PowerPC/fma.ll
index 815c72c..c47ae4b 100644
--- a/libclamav/c++/llvm/test/CodeGen/PowerPC/fma.ll
+++ b/libclamav/c++/llvm/test/CodeGen/PowerPC/fma.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   egrep {fn?madd|fn?msub} | count 8
+; RUN:   grep -E {fn?madd|fn?msub} | count 8
 
 define double @test_FMADD1(double %A, double %B, double %C) {
 	%D = fmul double %A, %B		; <double> [#uses=1]
diff --git a/libclamav/c++/llvm/test/CodeGen/X86/byval7.ll b/libclamav/c++/llvm/test/CodeGen/X86/byval7.ll
index 0da93ba..7284955 100644
--- a/libclamav/c++/llvm/test/CodeGen/X86/byval7.ll
+++ b/libclamav/c++/llvm/test/CodeGen/X86/byval7.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=yonah | egrep {add|lea} | grep 16
+; RUN: llc < %s -march=x86 -mcpu=yonah | grep -E {add|lea} | grep 16
 
 	%struct.S = type { <2 x i64>, <2 x i64>, <2 x i64>, <2 x i64>,
                            <2 x i64> }
diff --git a/libclamav/c++/llvm/test/CodeGen/X86/dyn-stackalloc.ll b/libclamav/c++/llvm/test/CodeGen/X86/dyn-stackalloc.ll
index 1df0920..7f0181f 100644
--- a/libclamav/c++/llvm/test/CodeGen/X86/dyn-stackalloc.ll
+++ b/libclamav/c++/llvm/test/CodeGen/X86/dyn-stackalloc.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=x86 | not egrep {\\\$4294967289|-7}
-; RUN: llc < %s -march=x86 | egrep {\\\$4294967280|-16}
+; RUN: llc < %s -march=x86 | not grep -E {\\\$4294967289|-7}
+; RUN: llc < %s -march=x86 | grep -E {\\\$4294967280|-16}
 ; RUN: llc < %s -march=x86-64 | grep {\\-16}
 
 define void @t() nounwind {
diff --git a/libclamav/c++/llvm/test/CodeGen/X86/fp-in-intregs.ll b/libclamav/c++/llvm/test/CodeGen/X86/fp-in-intregs.ll
index 08ea77d..5d895a4 100644
--- a/libclamav/c++/llvm/test/CodeGen/X86/fp-in-intregs.ll
+++ b/libclamav/c++/llvm/test/CodeGen/X86/fp-in-intregs.ll
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=yonah | not egrep {\(\(xor\|and\)ps\|movd\)}
+; RUN: llc < %s -march=x86 -mcpu=yonah | not grep -E {\(\(xor\|and\)ps\|movd\)}
 
 ; These operations should be done in integer registers, eliminating constant
 ; pool loads, movd's etc.
diff --git a/libclamav/c++/llvm/test/CodeGen/X86/negative-sin.ll b/libclamav/c++/llvm/test/CodeGen/X86/negative-sin.ll
index 7842eb8..3bc7908 100644
--- a/libclamav/c++/llvm/test/CodeGen/X86/negative-sin.ll
+++ b/libclamav/c++/llvm/test/CodeGen/X86/negative-sin.ll
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -enable-unsafe-fp-math -march=x86-64 | \
-; RUN:   not egrep {addsd|subsd|xor}
+; RUN:   not grep -E {addsd|subsd|xor}
 
 declare double @sin(double %f)
 
diff --git a/libclamav/c++/llvm/test/ExecutionEngine/test-fp.ll b/libclamav/c++/llvm/test/ExecutionEngine/test-fp.ll
index 989139a..76d00ad 100644
--- a/libclamav/c++/llvm/test/ExecutionEngine/test-fp.ll
+++ b/libclamav/c++/llvm/test/ExecutionEngine/test-fp.ll
@@ -1,7 +1,6 @@
 ; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
-; ??
-; XFAIL: *
+; RXUN: lli %t.bc > /dev/null
+; FP needs libcalls, which ClamAV has disabled, disable this test
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]
diff --git a/libclamav/c++/llvm/test/lit.cfg b/libclamav/c++/llvm/test/lit.cfg
index b4aec5a..0f49f4b 100644
--- a/libclamav/c++/llvm/test/lit.cfg
+++ b/libclamav/c++/llvm/test/lit.cfg
@@ -109,6 +109,7 @@ for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):
 
 # Add substitutions.
 config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))
+config.substitutions.append(('grep ', site_exp['grep']+" "))
 for sub in ['llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c',
             'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',
             'bugpoint_topts']:

-- 
Debian repository for ClamAV