@@ -15,5 +15,4 @@ target.h

 config.log

 config.status

 libclamav.pc

-unit_tests/*

 autom4te.cache/*

@@ -29,7 +29,7 @@ pkgconfig_DATA = libclamav.pc

 # don't complain that configuration files and databases are not removed, this is intended

 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print

 DISTCLEANFILES = target.h

-if DISTCHECK_ENABLE_FLAGS 

+if DISTCHECK_ENABLE_FLAGS

 DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav CFLAGS="-Wno-pointer-sign -Werror-implicit-function-declaration -Werror -Wextra -Wall -Wbad-function-cast -Wcast-align -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wno-error=missing-prototypes -Wnested-externs -Wno-error=nested-externs -Wpointer-arith -Wstrict-prototypes -Wno-error=strict-prototypes -Wno-switch -Wno-switch-enum -Wundef -Wwrite-strings -Wstrict-overflow=1 -Winit-self -Wmissing-include-dirs -Wstrict-aliasing -Wdeclaration-after-statement -Waggregate-return -Wmissing-format-attribute -Wno-error=missing-format-attribute -Wno-error=type-limits -Wno-error=unused-value -Wno-error=unused-variable -Wcast-qual -Wno-error=cast-qual -Wno-error=sign-compare -Wshadow -Wno-error=shadow -Wno-error=uninitialized -fdiagnostics-show-option -Wno-unused-parameter -Wno-error=unreachable-code -Winvalid-pch -Wno-error=invalid-pch -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-all -Wstack-protector -Wno-error=aggregate-return"

 else

 DISTCHECK_CONFIGURE_FLAGS=--enable-milter --disable-clamav

@@ -384,7 +384,8 @@ DISTCLEANFILES = target.h

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-D_FORTIFY_SOURCE=2 \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-fstack-protector-all \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstack-protector \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return"

+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return" \

+@DISTCHECK_ENABLE_FLAGS_TRUE@	VERBOSE=1

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -33,7 +33,7 @@ AC_CREATE_TARGET_H([target.h])

 dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings

 dnl enable stealth builds and psychedelic tests

-AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define color-tests])

+AM_INIT_AUTOMAKE([1.11 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define color-tests parallel-tests tar-ustar])

 AM_SILENT_RULES([yes])

 dnl we told automake to not define these, since we want to include

@@ -1,14 +1,22 @@

 SPLIT_DIR=$(top_srcdir)/unit_tests/.split

 FILES = clam-phish-exe

-check_clamd.sh: $(FILES)

+check2_clamd.sh: $(FILES)

+check3_clamd.sh: $(FILES)

+check4_clamd.sh: $(FILES)

+check5_clamd_vg.sh: $(FILES)

+check6_clamd_vg.sh: $(FILES)

+check7_clamd_vg.sh: $(FILES)

+check8_clamd_hg.sh: $(FILES)

+check9_clamd_hg.sh: $(FILES)

+check10_clamd_hg.sh: $(FILES)

 $(FILES) :

 	cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@

 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

+scripts = check_freshclam.sh check_sigtool.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\

+	  check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh

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

 if ENABLE_UNRAR

 else

@@ -42,8 +50,8 @@ $(top_builddir)/test/clam.exe:

 quick-check:

 	VALGRIND=no LIBEFENCE=no LIBDUMA=no $(MAKE) check

-CLEANFILES=lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log valgrind-*.log duma.log duma2.log clamscan2.log

-EXTRA_DIST=.split $(srcdir)/*.ref input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh

+CLEANFILES=lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log accdenied

+EXTRA_DIST=.split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh check_common.sh

 if ENABLE_COVERAGE

 LCOV_OUTPUT = lcov.out

 LCOV_HTML = lcov_html

@@ -133,6 +133,76 @@ test "X$(AM_COLOR_TESTS)" != Xno \

   blu=''; \

   std=''; \

 }

+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

+am__vpath_adj = case $$p in \

+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

+    *) f=$$p;; \

+  esac;

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

+am__install_max = 40

+am__nobase_strip_setup = \

+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

+am__nobase_strip = \

+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

+am__nobase_list = $(am__nobase_strip_setup); \

+  for p in $$list; do echo "$$p $$p"; done | \

+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \

+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

+    if (++n[$$2] == $(am__install_max)) \

+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

+    END { for (dir in files) print dir, files[dir] }'

+am__base_list = \

+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

+# Restructured Text title and section.

+am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'

+am__rst_section = sed 'p;s/./=/g;p;g'

+# Put stdin (possibly several lines separated by ".  ") in a box.

+am__text_box = $(AWK) '{				\

+  n = split($$0, lines, "\\.  "); max = 0;		\

+  for (i = 1; i <= n; ++i)				\

+    if (max < length(lines[i]))				\

+      max = length(lines[i]);				\

+  for (i = 0; i < max; ++i) line = line "=";		\

+  print line;						\

+  for (i = 1; i <= n; ++i) if (lines[i]) print lines[i];\

+  print line;						\

+}'

+# Solaris 10 'make', and several other traditional 'make' implementations,

+# pass "-e" to $(SHELL).  This contradicts POSIX.  Work around the problem

+# by disabling -e (using the XSI extension "set +e") if it's set.

+am__sh_e_setup = case $$- in *e*) set +e;; esac

+# To be inserted before the command running the test.  Creates the

+# directory for the log if needed.  Stores in $dir the directory

+# containing $f, in $tst the test, in $log the log, and passes

+# TESTS_ENVIRONMENT.  Save and restore TERM around use of

+# TESTS_ENVIRONMENT, in case that unsets it.

+am__check_pre = \

+$(am__sh_e_setup);					\

+$(am__vpath_adj_setup) $(am__vpath_adj)			\

+srcdir=$(srcdir); export srcdir;			\

+rm -f $@-t;						\

+trap 'st=$$?; rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st' \

+  1 2 13 15;						\

+am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\

+test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\

+if test -f "./$$f"; then dir=./;			\

+elif test -f "$$f"; then dir=;				\

+else dir="$(srcdir)/"; fi;				\

+tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;		\

+$(TESTS_ENVIRONMENT)

+RECHECK_LOGS = $(TEST_LOGS)

+AM_RECURSIVE_TARGETS = check check-html recheck recheck-html

+TEST_SUITE_LOG = test-suite.log

+TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)

+TEST_EXTENSIONS = @EXEEXT@ .test

+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)

+am__test_logs1 = $(TESTS:=.log)

+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)

+TEST_LOGS = $(am__test_logs2:.test.log=.log)

+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \

+	$(TEST_LOG_FLAGS)

+TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 ACLOCAL = @ACLOCAL@

 AMTAR = @AMTAR@

@@ -294,8 +364,8 @@ top_srcdir = @top_srcdir@

 SPLIT_DIR = $(top_srcdir)/unit_tests/.split

 FILES = clam-phish-exe

 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

+scripts = check_freshclam.sh check_sigtool.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\

+	  check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh

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

 	$(am__append_1)

@@ -312,8 +382,8 @@ check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_TRUE@check_clamd_SOURCES = check_clamd.c checks_common.h

 @HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"

 @HAVE_LIBCHECK_TRUE@check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@

-CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log valgrind-*.log duma.log duma2.log clamscan2.log

-EXTRA_DIST = .split $(srcdir)/*.ref input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh

+CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log accdenied

+EXTRA_DIST = .split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh check_common.sh

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

 @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html

 @ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@

@@ -323,7 +393,7 @@ EXTRA_DIST = .split $(srcdir)/*.ref input test-clamd.conf test-freshclam.conf va

 all: all-am

 .SUFFIXES:

-.SUFFIXES: .c .lo .o .obj

+.SUFFIXES: .c .html .lo .log .o .obj .test .test$(EXEEXT)

 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)

 	@for dep in $?; do \

 	  case '$(am__configure_deps)' in \

@@ -663,97 +733,183 @@ GTAGS:

 distclean-tags:

 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-check-TESTS: $(TESTS)

-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \

-	srcdir=$(srcdir); export srcdir; \

-	list=' $(TESTS) '; \

-	$(am__tty_colors); \

-	if test -n "$$list"; then \

-	  for tst in $$list; do \

-	    if test -f ./$$tst; then dir=./; \

-	    elif test -f $$tst; then dir=; \

-	    else dir="$(srcdir)/"; fi; \

-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \

-	      all=`expr $$all + 1`; \

-	      case " $(XFAIL_TESTS) " in \

-	      *[\ \	]$$tst[\ \	]*) \

-		xpass=`expr $$xpass + 1`; \

-		failed=`expr $$failed + 1`; \

-		col=$$red; res=XPASS; \

-	      ;; \

-	      *) \

-		col=$$grn; res=PASS; \

-	      ;; \

-	      esac; \

-	    elif test $$? -ne 77; then \

-	      all=`expr $$all + 1`; \

-	      case " $(XFAIL_TESTS) " in \

-	      *[\ \	]$$tst[\ \	]*) \

-		xfail=`expr $$xfail + 1`; \

-		col=$$lgn; res=XFAIL; \

-	      ;; \

-	      *) \

-		failed=`expr $$failed + 1`; \

-		col=$$red; res=FAIL; \

-	      ;; \

-	      esac; \

-	    else \

-	      skip=`expr $$skip + 1`; \

-	      col=$$blu; res=SKIP; \

-	    fi; \

-	    echo "$${col}$$res$${std}: $$tst"; \

-	  done; \

-	  if test "$$all" -eq 1; then \

-	    tests="test"; \

-	    All=""; \

-	  else \

-	    tests="tests"; \

-	    All="All "; \

-	  fi; \

-	  if test "$$failed" -eq 0; then \

-	    if test "$$xfail" -eq 0; then \

-	      banner="$$All$$all $$tests passed"; \

-	    else \

-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \

-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \

-	    fi; \

-	  else \

-	    if test "$$xpass" -eq 0; then \

-	      banner="$$failed of $$all $$tests failed"; \

-	    else \

-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \

-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \

-	    fi; \

-	  fi; \

-	  dashes="$$banner"; \

-	  skipped=""; \

-	  if test "$$skip" -ne 0; then \

-	    if test "$$skip" -eq 1; then \

-	      skipped="($$skip test was not run)"; \

-	    else \

-	      skipped="($$skip tests were not run)"; \

-	    fi; \

-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \

-	      dashes="$$skipped"; \

-	  fi; \

-	  report=""; \

-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \

-	    report="Please report to $(PACKAGE_BUGREPORT)"; \

-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \

-	      dashes="$$report"; \

-	  fi; \

-	  dashes=`echo "$$dashes" | sed s/./=/g`; \

-	  if test "$$failed" -eq 0; then \

-	    echo "$$grn$$dashes"; \

-	  else \

-	    echo "$$red$$dashes"; \

-	  fi; \

-	  echo "$$banner"; \

-	  test -z "$$skipped" || echo "$$skipped"; \

-	  test -z "$$report" || echo "$$report"; \

-	  echo "$$dashes$$std"; \

-	  test "$$failed" -eq 0; \

-	else :; fi

+# To be appended to the command running the test.  Handle the stdout

+# and stderr redirection, and catch the exit status.

+am__check_post =					\

+>$@-t 2>&1;						\

+estatus=$$?;						\

+if test -n '$(DISABLE_HARD_ERRORS)'			\

+   && test $$estatus -eq 99; then			\

+  estatus=1;						\

+fi;							\

+TERM=$$__SAVED_TERM; export TERM;			\

+$(am__tty_colors);					\

+xfailed=PASS;						\

+case " $(XFAIL_TESTS) " in				\

+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \

+    xfailed=XFAIL;;					\

+esac;							\

+case $$estatus:$$xfailed in				\

+    0:XFAIL) col=$$red; res=XPASS;;			\

+    0:*)     col=$$grn; res=PASS ;;			\

+    77:*)    col=$$blu; res=SKIP ;;			\

+    99:*)    col=$$red; res=FAIL ;;			\

+    *:XFAIL) col=$$lgn; res=XFAIL;;			\

+    *:*)     col=$$red; res=FAIL ;;			\

+esac;							\

+echo "$${col}$$res$${std}: $$f";			\

+echo "$$res: $$f (exit: $$estatus)" |			\

+  $(am__rst_section) >$@;				\

+cat $@-t >>$@;						\

+rm -f $@-t

+

+$(TEST_SUITE_LOG): $(TEST_LOGS)

+	@$(am__sh_e_setup);						\

+	list='$(TEST_LOGS)';						\

+	results=`for f in $$list; do					\

+		   read line < $$f && echo "$$line" || echo FAIL;	\

+		 done`;							\

+	all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[	 ]*//'`; \

+	fail=`echo "$$results" | grep -c '^FAIL'`;			\

+	pass=`echo "$$results" | grep -c '^PASS'`;			\

+	skip=`echo "$$results" | grep -c '^SKIP'`;			\

+	xfail=`echo "$$results" | grep -c '^XFAIL'`;			\

+	xpass=`echo "$$results" | grep -c '^XPASS'`;			\

+	failures=`expr $$fail + $$xpass`;				\

+	all=`expr $$all - $$skip`;					\

+	if test "$$all" -eq 1; then tests=test; All=;			\

+	else tests=tests; All="All "; fi;				\

+	case fail=$$fail:xpass=$$xpass:xfail=$$xfail in			\

+	  fail=0:xpass=0:xfail=0)					\

+	    msg="$$All$$all $$tests passed.  ";				\

+	    exit=true;;							\

+	  fail=0:xpass=0:xfail=*)					\

+	    msg="$$All$$all $$tests behaved as expected";		\

+	    if test "$$xfail" -eq 1; then xfailures=failure;		\

+	    else xfailures=failures; fi;				\

+	    msg="$$msg ($$xfail expected $$xfailures).  ";		\

+	    exit=true;;							\

+	  fail=*:xpass=0:xfail=*)					\

+	    msg="$$fail of $$all $$tests failed.  ";			\

+	    exit=false;;						\

+	  fail=*:xpass=*:xfail=*)					\

+	    msg="$$failures of $$all $$tests did not behave as expected"; \

+	    if test "$$xpass" -eq 1; then xpasses=pass;			\

+	    else xpasses=passes; fi;					\

+	    msg="$$msg ($$xpass unexpected $$xpasses).  ";		\

+	    exit=false;;						\

+	  *)								\

+	    echo >&2 "incorrect case"; exit 4;;				\

+	esac;								\

+	if test "$$skip" -ne 0; then					\

+	  if test "$$skip" -eq 1; then					\

+	    msg="$$msg($$skip test was not run).  ";			\

+	  else								\

+	    msg="$$msg($$skip tests were not run).  ";			\

+	  fi;								\

+	fi;								\

+	{								\

+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\

+	    $(am__rst_title);						\

+	  echo "$$msg";							\

+	  echo;								\

+	  echo ".. contents:: :depth: 2";				\

+	  echo;								\

+	  for f in $$list; do						\

+	    read line < $$f;						\

+	    case $$line in						\

+	      PASS:*|XFAIL:*);;						\

+	      *) echo; cat $$f;;					\

+	    esac;							\

+	  done;								\

+	} >$(TEST_SUITE_LOG).tmp;					\

+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\

+	if test "$$failures" -ne 0; then				\

+	  msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";		\

+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\

+	    msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";	\

+	  fi;								\

+	fi;								\

+	test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);	\

+	$(am__tty_colors);						\

+	if $$exit; then							\

+	  echo $(ECHO_N) "$$grn$(ECHO_C)";				\

+	 else								\

+	  echo $(ECHO_N) "$$red$(ECHO_C)";				\

+	fi;								\

+	echo "$$msg" | $(am__text_box);					\

+	echo $(ECHO_N) "$$std$(ECHO_C)";				\

+	$$exit

+

+# Run all the tests.

+check-TESTS:

+	@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list

+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)

+	@set_logs=; if test "X$(TEST_LOGS)" = X.log; then		\

+	  set_logs=TEST_LOGS=;						\

+	fi;								\

+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs

+

+.log.html:

+	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\

+	for r2h in $$list; do						\

+	  if ($$r2h --version) >/dev/null 2>&1; then			\

+	    R2H=$$r2h;							\

+	  fi;								\

+	done;								\

+	if test -z "$$R2H"; then					\

+	  echo >&2 "cannot find rst2html, cannot create $@";		\

+	  exit 2;							\

+	fi;								\

+	$$R2H $< >$@.tmp

+	@mv $@.tmp $@

+

+# Be sure to run check first, and then to convert the result.

+# Beware of concurrent executions.  Run "check" not "check-TESTS", as

+# check-SCRIPTS and other dependencies are rebuilt by the former only.

+# And expect check to fail.

+check-html:

+	@if $(MAKE) $(AM_MAKEFLAGS) check; then			\

+	  rv=0; else rv=$$?;					\

+	fi;							\

+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) || exit 4;	\

+	exit $$rv

+recheck recheck-html:

+	@target=`echo $@ | sed 's,^re,,'`;				\

+	list='$(TEST_LOGS)';						\

+	list=`for f in $$list; do					\

+	        test -f $$f || continue;				\

+	        if read line < $$f; then				\

+	          case $$line in FAIL*|XPASS*) echo $$f;; esac;		\

+	        else echo $$f; fi;					\

+	      done | tr '\012\015' '  '`;				\

+	$(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) TEST_LOGS="'"$$list"'"'

+check_clamav.log: check_clamav$(EXEEXT)

+	@p='check_clamav$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check_freshclam.sh.log: check_freshclam.sh

+	@p='check_freshclam.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check_sigtool.sh.log: check_sigtool.sh

+	@p='check_sigtool.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check1_clamscan.sh.log: check1_clamscan.sh

+	@p='check1_clamscan.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check2_clamd.sh.log: check2_clamd.sh

+	@p='check2_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check3_clamd.sh.log: check3_clamd.sh

+	@p='check3_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check4_clamd.sh.log: check4_clamd.sh

+	@p='check4_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check5_clamd_vg.sh.log: check5_clamd_vg.sh

+	@p='check5_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check6_clamd_vg.sh.log: check6_clamd_vg.sh

+	@p='check6_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check7_clamd_hg.sh.log: check7_clamd_hg.sh

+	@p='check7_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+check8_clamd_hg.sh.log: check8_clamd_hg.sh

+	@p='check8_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)

+.test.log:

+	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)

+@am__EXEEXT_TRUE@.test$(EXEEXT).log:

+@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)

 distdir: $(DISTFILES)

 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

@@ -806,6 +962,10 @@ install-strip:

 	  `test -z '$(STRIP)' || \

 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

 mostlyclean-generic:

+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)

+	-test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)

+	-test -z "$(TEST_SUITE_HTML)" || rm -f $(TEST_SUITE_HTML)

+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)

 clean-generic:

 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

@@ -889,24 +1049,33 @@ ps-am:

 uninstall-am:

-.MAKE: check-am install-am install-strip

-

-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \

-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \

-	ctags distclean distclean-compile distclean-generic \

-	distclean-libtool distclean-tags distdir dvi dvi-am html \

-	html-am info info-am install install-am install-data \

-	install-data-am install-dvi install-dvi-am install-exec \

-	install-exec-am install-html install-html-am install-info \

-	install-info-am install-man install-pdf install-pdf-am \

-	install-ps install-ps-am install-strip installcheck \

-	installcheck-am installdirs maintainer-clean \

+.MAKE: check-am check-html install-am install-strip recheck \

+	recheck-html

+

+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-html \

+	clean clean-checkPROGRAMS clean-generic clean-libtool \

+	clean-local ctags distclean distclean-compile \

+	distclean-generic distclean-libtool distclean-tags distdir dvi \

+	dvi-am html html-am info info-am install install-am \

+	install-data install-data-am install-dvi install-dvi-am \

+	install-exec install-exec-am install-html install-html-am \

+	install-info install-info-am install-man install-pdf \

+	install-pdf-am install-ps install-ps-am install-strip \

+	installcheck installcheck-am installdirs maintainer-clean \

 	maintainer-clean-generic mostlyclean mostlyclean-compile \

 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

-	tags uninstall uninstall-am

-

-

-check_clamd.sh: $(FILES)

+	recheck recheck-html tags uninstall uninstall-am

+

+

+check2_clamd.sh: $(FILES)

+check3_clamd.sh: $(FILES)

+check4_clamd.sh: $(FILES)

+check5_clamd_vg.sh: $(FILES)

+check6_clamd_vg.sh: $(FILES)

+check7_clamd_vg.sh: $(FILES)

+check8_clamd_hg.sh: $(FILES)

+check9_clamd_hg.sh: $(FILES)

+check10_clamd_hg.sh: $(FILES)

 $(FILES) :

 	cat $(SPLIT_DIR)/split.$@aa $(SPLIT_DIR)/split.$@ab > $@

new file mode 100755

@@ -0,0 +1,3 @@

+#!/bin/sh

+. $abs_srcdir/check_common.sh

+test_clamscan 1

new file mode 100755

@@ -0,0 +1,3 @@

+#!/bin/sh

+. $srcdir/check_common.sh

+test_clamd1 2

new file mode 100755

@@ -0,0 +1,3 @@

+#!/bin/sh

+. $srcdir/check_common.sh

+test_clamd2 3

new file mode 100755

@@ -0,0 +1,3 @@

+#!/bin/sh 

+. $srcdir/check_common.sh

+test_clamd3 4

new file mode 100755

@@ -0,0 +1,5 @@

+#!/bin/sh

+. $srcdir/check_common.sh

+init_valgrind

+WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_clamd1 5

+end_valgrind

new file mode 100755

@@ -0,0 +1,5 @@

+#!/bin/sh

+. $srcdir/check_common.sh

+init_valgrind

+WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_clamd2 6

+end_valgrind

new file mode 100755

@@ -0,0 +1,5 @@

+#!/bin/sh

+. $srcdir/check_common.sh

+init_helgrind

+WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" test_clamd1 7

+end_valgrind

new file mode 100755

@@ -0,0 +1,5 @@

+#!/bin/sh

+. $srcdir/check_common.sh

+init_helgrind

+WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" test_clamd2 8

+end_valgrind

deleted file mode 100755

@@ -1,289 +0,0 @@

-#!/bin/sh 

-CLAMD_WRAPPER=${CLAMD_WRAPPER-}

-CLAMD_TEST_UNIQ1=${CLAMD_TEST_UNIQ1-1}

-CLAMD_TEST_UNIQ2=${CLAMD_TEST_UNIQ2-2}

-TOP="../.."

-LTEXEC="$TOP/libtool --mode=execute"

-killclamd() {

-	test -f clamd-test.pid || return

-	pid=`cat clamd-test.pid 2>/dev/null`

-	if test "X$pid" = "X"; then

-		# file can be removed between the 'test' and 'cat',

-		# it happened a few times for me

-		return

-	fi

-	kill -0 $pid 2>/dev/null || return

-	kill $pid

-	pippo=0

-	while kill -0 $pid 2>/dev/null; do

-		sleep 1

-		pippo=`expr $pippo + 1`

-		if test $pippo -gt 9; then

-			kill -KILL $pid

-			echo "Clamd didn't quit";

-			rm -f clamd-test.pid

-			exit 4;

-		fi

-	done

-	rm -f clamd-test.pid

-}

-

-die()

-{

-	killclamd

-	exit $1

-}

-

-error()

-{

-	echo >&2

-	echo "***" >&2

-	echo "*** $1" >&2

-	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 ../clamd-test1.log ../clamd-test2.log

-	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 --help >clamd-test.log 2>&1 || 

-		{ error "Failed to start clamd --help!"; cat clamd-test.log; die 1; }

-	grep "Clam AntiVirus Daemon" clamd-test.log >/dev/null ||

-		{ error "Wrong --help reply from clamd!"; die 1; }

-	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 >clamd-test.log 2>&1 || 

-		{ error "Failed to start clamd!"; cat clamd-test.log; die 1; }

-}

-

-run_clamdscan_fileonly() {

-	rm -f clamdscan.log clamdscan-multiscan.log

-	$TOP/clamdscan/clamdscan --version --config-file=test-clamd.conf 2>&1|grep "^ClamAV" >/dev/null || 

-		{ error "clamdscan can't get version of clamd!"; die 1;}

-	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* --log=clamdscan.log

-	if test $? = 2; then 

-		error "Failed to run clamdscan!"

-		cat clamdscan.log

-		die 1

-	fi

-	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* -m --log=clamdscan-multiscan.log

-	if test $? = 2; then 

-		error "Failed to run clamdscan (multiscan)!"

-		cat clamdscan-multiscan.log

-		die 1

-	fi

-}

-

-run_clamdscan() {

-	run_clamdscan_fileonly $*

-	rm -f clamdscan-fdpass.log clamdscan-multiscan-fdpass.log

-	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* --fdpass --log=clamdscan-fdpass.log

-	if test $? = 2; then 

-		error "Failed to run clamdscan (fdpass)!"

-		cat clamdscan-fdpass.log

-		die 1

-	fi

-	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* -m --fdpass --log=clamdscan-multiscan-fdpass.log

-	if test $? = 2; then 

-		error "Failed to run clamdscan (fdpass + multiscan)!"

-		cat clamdscan-multiscan-fdpass.log

-		die 1

-	fi

-	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* --stream --log=clamdscan-stream.log

-	if test $? = 2; then 

-		error "Failed to run clamdscan (instream)!"

-		cat clamdscan-stream.log

-		die 1

-	fi

-	$TOP/clamdscan/clamdscan --quiet --config-file=test-clamd.conf $* -m --stream --log=clamdscan-multiscan-stream.log

-	if test $? = 2; then 

-		error "Failed to run clamdscan (instream + multiscan)!"

-		cat clamdscan-multiscan-stream.log

-		die 1

-	fi

-}

-

-run_reload_test()

-{

-	rm -f reload-testfile

-	echo "ClamAV-RELOAD-Test" >reload-testfile

-	run_clamdscan reload-testfile

-	grep "ClamAV-RELOAD-TestFile" clamdscan.log >/dev/null 2>/dev/null;

-	if test $? -eq 0; then

-		# it is not supposed to detect until we actually put the

-		# signature there and reload!

-		error "RELOAD test failed!"

-		cat clamdscan.log

-		die 10

-	fi

-	echo "ClamAV-RELOAD-TestFile:0:0:436c616d41562d52454c4f41442d54657374" >test-db/new.ndb

-	$TOP/clamdscan/clamdscan --reload --config-file=test-clamd.conf

-	if test $? -ne 0; then

-		error "clamdscan says reload failed!"

-		die 11

-	fi

-	run_clamdscan reload-testfile

-	grep "ClamAV-RELOAD-TestFile" clamdscan.log >/dev/null 2>/dev/null;

-	failed=0

-	if test $? -ne 0; then

-		error "RELOAD test failed! (after reload)"

-		cat clamdscan.log

-		failed=1

-	fi

-	grep "ClamAV-RELOAD-TestFile" clamdscan-multiscan.log >/dev/null 2>/dev/null;

-	if test $? -ne 0; then

-		error "RELOAD test failed! (after reload, multiscan)"

-		cat clamdscan-multiscan.log

-		failed=1

-	fi

-	if test "$failed" = "1"; then

-		echo "RELOAD tests failed!"

-		die 12

-	fi

-	rm -f reload-testfile

-}

-

-run_clamdscan_fdpass() {

-	rm -f clamdscan.log

-	$TOP/clamdscan/clamdscan --quiet --fdpass --config-file=test-clamd.conf - <$1 --log=clamdscan.log

-	if test $? = 2; then

-		error "Failed to run clamdscan (fdpass)!"

-		cat clamdscan.log

-		die 14

-	fi

-}

-

-# We run multiple clamd tests in parallel, each in its own directory

-prepare_clamd()

-{

-	cd clamdtest$1 

-	# Set up test DBdir

-	rm -rf test-db

-	mkdir -p test-db

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

-aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File

-EOF

-	cp $abs_srcdir/input/daily.pdb test-db/

-	$AWK "{ sub(/X/,\"$1\"); sub(/CWD/,\"`pwd`\"); print }" $abs_srcdir/test-clamd.conf >test-clamd.conf

-}

-

-rm -rf clamdtest$CLAMD_TEST_UNIQ1 clamdtest$CLAMD_TEST_UNIQ2

-mkdir clamdtest$CLAMD_TEST_UNIQ1 clamdtest$CLAMD_TEST_UNIQ2 || 

-	{ echo "Unable to create temporary directories!"; exit 1; }

-

-# Prepare configuration for clamd #1 and #2

-(prepare_clamd $CLAMD_TEST_UNIQ1)

-(prepare_clamd $CLAMD_TEST_UNIQ2)

-# Add clamd #2 specific configuration

-echo "VirusEvent $abs_srcdir/virusaction-test.sh `pwd`/clamdtest$CLAMD_TEST_UNIQ2 \"Virus found: %v\"" >>clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

-echo "HeuristicScanPrecedence yes" >>clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

-grep -v LogFile clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf >tmp__

-mv tmp__ clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

-

-# Start clamd #1 tests

-(cd clamdtest$CLAMD_TEST_UNIQ1 

-start_clamd test-clamd.conf

-

-# Test that all testfiles are detected

-FILES=$TOP/test/clam*

-run_clamdscan $FILES

-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'`

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

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

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

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

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

-	grep OK clamdscan.log

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

-fi

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

-	grep OK clamdscan-multiscan.log

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

-fi

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

-	grep OK clamdscan-fdpass.log

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

-fi

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

-	grep OK clamdscan-multiscan-fdpass.log

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

-fi

-

-$TOP/unit_tests/check_clamd

-ecode=$?

-if test $ecode -ne 77 && test $ecode -ne 0; then

-    error "Failed clamd protocol test!"

-    die 1

-fi

-# Test HeuristicScanPrecedence off feature

-run_clamdscan ../clam-phish-exe

-grep "ClamAV-Test-File" clamdscan.log >/dev/null 2>/dev/null;

-if test $? -ne 0; then

-	error "HeuristicScanPrecedence off test failed!"

-	cat clamdscan.log

-	die 4

-fi

-die 0

-)&

-pid1=$!

-

-# Start clamd #2 tests

-(cd clamdtest$CLAMD_TEST_UNIQ2

-start_clamd test-clamd.conf

-

-# Test VirusEvent feature

-run_clamdscan_fileonly $TOP/test/clam.exe

-grep "Virus found: ClamAV-Test-File.UNOFFICIAL" test-clamd.log >/dev/null 2>/dev/null; 

-if test $? -ne 0; then

-	error "Virusaction test failed!" 

-	cat test-clamd.log

-	die 2

-fi

-

-# Test HeuristicScanPrecedence feature

-run_clamdscan ../clam-phish-exe

-grep "Phishing.Heuristics.Email.SpoofedDomain" clamdscan.log >/dev/null 2>/dev/null;

-if test $? -ne 0; then

-	error "HeuristicScanPrecedence on test failed!"

-	cat clamdscan.log

-	die 3

-fi

-

-if grep "^#define HAVE_FD_PASSING 1" $TOP/clamav-config.h >/dev/null; then

-	run_clamdscan_fdpass $TOP/test/clam.exe

-	grep "ClamAV-Test-File" clamdscan.log >/dev/null 2>/dev/null;

-	if test $? -ne 0; then

-		error "FDpassing test failed!"

-		cat clamdscan.log;

-		die 4

-	fi

-else

-	echo "*** No file descriptor passing support, skipping test"

-fi

-

-# Test RELOAD command

-run_reload_test

-

-die 0

-)&

-

-pid2=$!

-

-wait $pid1

-exitcode1=$?

-wait $pid2

-exitcode2=$?

-rm -rf clamdtest$CLAMD_TEST_UNIQ1 clamdtest$CLAMD_TEST_UNIQ2 test-db accdenied

-if (test $exitcode1 -ne 0 && test $exitcode1 -ne 127) || (test $exitcode2 -ne 0	&& test $exitcode2 -ne 127); then

-	exit 1

-fi

-exit 0

deleted file mode 100755

@@ -1,66 +0,0 @@

-#!/bin/sh 

-CLAMSCAN_WRAPPER=${CLAMSCAN_WRAPPER-}

-die() {

-	rm -rf test-db

-	exit $1;