@@ -1,3 +1,11 @@

+Tue Oct  7 22:52:06 EEST 2008 (edwin)

+-------------------------------------

+

+ * unit_tests/Makefile.am, unit_tests/Makefile.in,

+ unit_tests/check_clamd.sh, unit_tests/check_clamscan.sh: When RAR is

+ disabled, allow make check to succeed, and print only a warning (bb

+ #1212)

+

 Tue Oct  7 19:18:16 CEST 2008 (tk)

 ----------------------------------

   * shared/cfgparser.c, clamconf: gently deprecate obsolete options (bb#1213)

@@ -10,6 +10,10 @@ programs = check_clamav

 scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh\

 	 valgrind_tests.sh efence_tests.sh duma_tests.sh

 TESTS_ENVIRONMENT=export abs_srcdir=$(abs_srcdir) AWK=$(AWK);

+if ENABLE_UNRAR

+else

+TESTS_ENVIRONMENT += export unrar_disabled=1;

+endif

 TESTS = $(programs) $(scripts)

 check_PROGRAMS = $(programs)

 check_SCRIPTS = $(scripts)

@@ -32,6 +32,7 @@ POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+@ENABLE_UNRAR_FALSE@am__append_1 = export unrar_disabled=1;

 TESTS = $(am__EXEEXT_1) $(scripts)

 check_PROGRAMS = $(am__EXEEXT_1)

 subdir = unit_tests

@@ -233,7 +234,8 @@ programs = check_clamav

 scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh\

 	 valgrind_tests.sh efence_tests.sh duma_tests.sh

-TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK);

+TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK); \

+	$(am__append_1)

 check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c

 @HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c checks.h $(top_builddir)/libclamav/clamav.h\

@@ -39,6 +39,16 @@ error()

 	echo "***" >&2

 }

+scan_failed() {

+	if test "X$unrar_disabled" = "X1" && test `grep -v '\.rar' $1 | grep OK | wc -l` -eq 0

+	then

+		error "UNRAR is disabled, won't be able to detect unrar files!";

+	else

+		error  $2;

+		die 2;

+	fi

+}

+

 start_clamd()

 {

 	rm -f clamd-test.log

@@ -146,14 +156,12 @@ NFILES=`ls -1 $FILES | wc -l`

 NINFECTED=`grep "Infected files" clamdscan.log | cut -f2 -d:|sed -e 's/ //g'`

 NINFECTED_MULTI=`grep "Infected files" clamdscan-multiscan.log | cut -f2 -d:|sed -e 's/ //g'`

 if test "$NFILES" -ne "0$NINFECTED"; then

-	error "clamd did not detect all testfiles correctly!"

 	grep OK clamdscan.log

-	die 2

+	scan_failed clamdscan.log "clamd did not detect all testfiles correctly!"

 fi

 if test "$NFILES" -ne "0$NINFECTED_MULTI"; then

-	error "clamd did not detect all testfiles correctly in multiscan mode!"

 	grep OK clamdscan-multiscan.log

-	die 3

+	scan_failed clamdscan-multiscan.log "clamd did not detect all testfiles correctly in multiscan mode!"

 fi

 # Test HeuristicScanPrecedence off feature

@@ -1,9 +1,22 @@

-#!/bin/sh

+#!/bin/sh 

 CLAMSCAN_WRAPPER=${CLAMSCAN_WRAPPER-}

 die() {

 	rm -rf test-db

 	exit $1;

 }

+

+scan_failed() {

+	if test "X$unrar_disabled" = "X1" && test `grep -v '\.rar' $1 | grep OK | wc -l` -eq 0

+	then

+		echo "***" >&2;

+		echo "*** UNRAR is disabled, won't be able to detect unrar files!" >&2;

+		echo "***" >&2;

+	else

+		echo "clamscan did not detect all testfiles correctly!" >&2;

+		die 2;

+	fi

+}

+

 mkdir test-db

 cat <<EOF >test-db/test.hdb

 aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File

@@ -18,9 +31,8 @@ fi

 NFILES=`ls -1 ../test/clam* | wc -l`

 NINFECTED=`grep "Infected files" clamscan.log | cut -f2 -d: |sed -e 's/ //g'`

 if test "$NFILES" -ne "0$NINFECTED"; then

-	echo "clamscan did not detect all testfiles correctly!" >&2;

 	grep OK clamscan.log >&2;

-	die 2;

+	scan_failed clamscan.log

 fi

 cat <<EOF >test-db/test.pdb