git-svn: trunk@4118
Török Edvin authored on 2008/08/19 23:49:17... | ... |
@@ -57,8 +57,8 @@ cp $srcdir/input/daily.pdb test-db/ |
57 | 57 |
FILES=../test/clam* |
58 | 58 |
run_clamd_test $srcdir/test-clamd.conf $FILES |
59 | 59 |
NFILES=`ls -1 $FILES | wc -l` |
60 |
-NINFECTED=`grep "Infected files" clamdscan.log | cut -f2 -d:` |
|
61 |
-if test "$NFILES" -ne "$NINFECTED"; then |
|
60 |
+NINFECTED=`grep "Infected files" clamdscan.log | cut -f2 -d:|sed -e 's/ //g'` |
|
61 |
+if test "$NFILES" -ne "0$NINFECTED"; then |
|
62 | 62 |
echo "clamd did not detect all testfiles correctly!" >&2; |
63 | 63 |
grep OK clamdscan.log >&2; |
64 | 64 |
die 4; |
... | ... |
@@ -15,8 +15,8 @@ if test $? != 1; then |
15 | 15 |
die 1; |
16 | 16 |
fi |
17 | 17 |
NFILES=`ls -1 ../test/clam* | wc -l` |
18 |
-NINFECTED=`grep "Infected files" clamscan.log | cut -f2 -d:` |
|
19 |
-if test "$NFILES" -ne "$NINFECTED"; then |
|
18 |
+NINFECTED=`grep "Infected files" clamscan.log | cut -f2 -d: |sed -e 's/ //g'` |
|
19 |
+if test "$NFILES" -ne "0$NINFECTED"; then |
|
20 | 20 |
echo "clamscan did not detect all testfiles correctly!" >&2; |
21 | 21 |
grep OK clamscan.log >&2; |
22 | 22 |
die 2; |