@@ -9,6 +9,7 @@ $(FILES) :

 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);

 TESTS = $(programs) $(scripts)

 check_PROGRAMS = $(programs)

 check_SCRIPTS = $(scripts)

@@ -27,7 +28,7 @@ check_clamscan.sh: $(top_builddir)/test/clam.exe

 $(top_builddir)/test/clam.exe:

 	(cd $(top_builddir)/test && $(MAKE))

-CLEANFILES=lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind-*.log clamdscan.log clamdscan-multiscan.log duma.log

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

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

 if ENABLE_COVERAGE

 LCOV_OUTPUT = lcov.out

@@ -231,13 +231,14 @@ 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);

 check_SCRIPTS = $(scripts)

 @HAVE_LIBCHECK_FALSE@check_clamav_SOURCES = check_clamav_skip.c

 @HAVE_LIBCHECK_TRUE@check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c check_regex.c checks.h $(top_builddir)/libclamav/clamav.h check_disasm.c check_uniq.c check_matchers.c

 @HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\"

 @HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@

-CLEANFILES = lcov.out *.gcno *.gcda *.log clamd-test.socket /tmp/clamd-test.log $(FILES) test-stderr.log clamscan.log valgrind-*.log clamdscan.log clamdscan-multiscan.log duma.log

-EXTRA_DIST = .split input test-clamd.conf test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts)

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

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

 @ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out

 @ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html

 @ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@

@@ -1,8 +1,12 @@

 #!/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 /tmp/clamd-test.pid || return

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

+	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

@@ -18,12 +22,12 @@ killclamd() {

 			kill -KILL $pid

 		fi

 	done

-	rm -f /tmp/clamd-test.pid

+	rm -f clamd-test.pid

 }

-die() {

+die()

+{

 	killclamd

-	rm -rf test-db test-clamd1.conf test-clamd2.conf test-clamd.log	clamd-test.socket reload-testfile

 	exit $1

 }

@@ -37,27 +41,26 @@ error()

 start_clamd()

 {

-	rm -f /tmp/clamd-test.log

-	../libtool --mode=execute $CLAMD_WRAPPER ../clamd/clamd -c $1 || 

-		{ error "Failed to start clamd!"; die 1;}

+	rm -f clamd-test.log

+	$LTEXEC $CLAMD_WRAPPER $TOP/clamd/clamd -c $1 || 

+		{ error "Failed to start clamd!"; die 1; }

 }

 run_clamdscan() {

-	conf_file=$1

-	shift

 	rm -f clamdscan.log clamdscan-multiscan.log

-	../clamdscan/clamdscan --version --config-file $conf_file 2>&1|grep "^ClamAV" >/dev/null || 

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

-	../clamdscan/clamdscan --quiet --config-file $conf_file $* --log=clamdscan.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 3;	

+		die 1

 	fi

-	../clamdscan/clamdscan --quiet --config-file $conf_file $* -m --log=clamdscan-multiscan.log

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

 	if test $? = 2; then 

 		error "Failed to run clamdscan (multiscan)!"

-		die 3;	

+		cat clamdscan-multiscan.log

+		die 1

 	fi

 }

@@ -70,125 +73,142 @@ run_reload_test()

 	fi

 	rm -f reload-testfile

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

-	run_clamdscan test-clamd1.conf 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 7;

 	fi

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

-	echo RELOAD | nc -q 0 -n 127.0.0.1 3311

-	run_clamdscan test-clamd1.conf reload-testfile

+	echo RELOAD | nc -q 0 -n 127.0.0.1 331$CLAMD_TEST_UNIQ2

+	run_clamdscan reload-testfile

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

 	if test $? -ne 0; then

 		error "RELOAD test failed! (after reload)"

 		cat clamdscan.log

-		die 8;

 	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)"

-		die 9;

+		cat clamdscan-multiscan.log

 	fi

 	rm -f reload-testfile

 }

 run_clamdscan_fdpass() {

-	conf_file=$1

-	shift

 	rm -f clamdscan.log

-	../clamdscan/clamdscan --quiet --fdpass --config-file $conf_file - <$1 --log=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!"

-		die 9;

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

+		cat clamdscan.log

 	fi

 }

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

+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; }

 # 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 $srcdir/input/daily.ftm test-db/

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

-

-# Prepare for clamd #1

-cat <$srcdir/test-clamd.conf >test-clamd1.conf

-#  Use absolute path to dbdir, so that RELOAD works

-echo "DatabaseDirectory `pwd`/test-db" >>test-clamd1.conf

-

-# Start clamd #1

-start_clamd test-clamd1.conf

+cp $abs_srcdir/input/daily.ftm test-db/

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

+

+# Prepare configuration for clamd #1 and #2

+awk "{ sub(/X/,\"$CLAMD_TEST_UNIQ1\"); sub(/CWD/,\"`pwd`/clamdtest$CLAMD_TEST_UNIQ1\"); print }" $abs_srcdir/test-clamd.conf >clamdtest$CLAMD_TEST_UNIQ1/test-clamd.conf

+awk "{ sub(/X/,\"$CLAMD_TEST_UNIQ2\"); sub(/CWD/,\"`pwd`/clamdtest$CLAMD_TEST_UNIQ2\"); print }" $abs_srcdir/test-clamd.conf >clamdtest$CLAMD_TEST_UNIQ2/test-clamd.conf

+# 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

+# Duplicate dbdirs

+cp -R test-db clamdtest$CLAMD_TEST_UNIQ1/

+cp -R test-db clamdtest$CLAMD_TEST_UNIQ2/

+

+# Start clamd #1 tests

+(cd clamdtest$CLAMD_TEST_UNIQ1 

+start_clamd test-clamd.conf

 # Test that all testfiles are detected

-FILES=../test/clam*

-run_clamdscan test-clamd1.conf $FILES

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

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

 	error "clamd did not detect all testfiles correctly!"

 	grep OK clamdscan.log

-	die 4;

+	die 2

 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 5;

+	die 3

 fi

 # Test HeuristicScanPrecedence off feature

-run_clamdscan test-clamd1.conf clam-phish-exe

+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 6;

+	die 4

 fi

+die 0

+)&

+pid1=$!

-# Test RELOAD command

-run_reload_test

-killclamd 

-

-# Prepare configuration for clamd #2

-cat <test-clamd1.conf >test-clamd2.conf

-echo "VirusEvent `pwd`/$srcdir/virusaction-test.sh `pwd` \"Virus found: %v\"" >>test-clamd2.conf

-echo "HeuristicScanPrecedence yes" >>test-clamd2.conf

-

-# Start clamd #2

-start_clamd test-clamd2.conf

+# Start clamd #2 tests

+(cd clamdtest$CLAMD_TEST_UNIQ2

+start_clamd test-clamd.conf

 # Test VirusEvent feature

-run_clamdscan test-clamd2.conf ../test/clam.exe

+run_clamdscan $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 10;

+	die 2

 fi

 # Test HeuristicScanPrecedence feature

-run_clamdscan test-clamd2.conf clam-phish-exe

+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 11;

+	die 3

 fi

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

-	run_clamdscan_fdpass test-clamd2.conf ../test/clam.exe

+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 12;

+		die 4

 	fi

 else

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

 fi

-die 0;

+

+# 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

+if test $exitcode1 -ne 0 -o $exitcode2 -ne 0; then

+	exit 1

+fi

+exit 0

@@ -16,22 +16,33 @@ DUMA_DISABLE_BANNER=1

 LIBPRELOAD="$LIBDUMA"

 rm -f duma.log

 export DUMA_FILL DUMA_MALLOC_0_STRATEGY DUMA_OUTPUT_FILE DUMA_DISABLE_BANNER LIBPRELOAD

-echo "--- running clamd under duma to detect underruns"

-CLAMD_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamd.sh

-if test ! $?; then

-	echo "*** DUMA has detected errors"

-	cat duma.log

-	exit 3

-fi

+echo "--- starting clamd under duma to detect underruns"

+CLAMD_WRAPPER=$abs_srcdir/preload_run.sh $abs_srcdir/check_clamd.sh &

+pid1=$!

+

+echo "--- starting clamd under duma to detect underruns"

+DUMA_OUTPUT_FILE=duma2.log

 DUMA_PROTECT_BELOW=1

 export DUMA_PROTECT_BELOW

-echo "--- running clamd under duma to detect underruns"

-rm -f duma.log

-CLAMD_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamd.sh

-if test ! $?; then

+rm -f duma2.log

+CLAMD_TEST_UNIQ1=3 CLAMD_TEST_UNIQ2=4 CLAMD_WRAPPER=$abs_srcdir/preload_run.sh $abs_srcdir/check_clamd.sh&

+pid2=$!

+

+wait $pid1

+exitcode1=$?

+wait $pid2

+exitcode2=$?

+if test $exitcode1 -ne 0; then

 	echo "*** DUMA has detected errors"

 	cat duma.log

-	exit 3

+	rm -f duma.log duma2.log

+	exit 1

 fi

-rm -f duma.log

+if test $exitcode2 -ne 0; then

+	echo "*** DUMA has detected errors"

+	cat duma2.log

+	rm -f duma.log duma2.log

+	exit 1

+fi

+exit 0

@@ -18,7 +18,7 @@ VALGRIND=`which ${VALGRIND-valgrind}`

 if test ! -n "$VALGRIND" -o ! -x "$VALGRIND"; then

 	# run check_clamav under efence only if we don't have valgrind installed

 	echo "--- Running check_clamav under electric-fence"

-	CK_FORK=no ../libtool --mode=execute $srcdir/preload_run.sh ./check_clamav

+	CK_FORK=no ../libtool --mode=execute $abs_srcdir/preload_run.sh ./check_clamav

 	if test ! $?; then

 		echo "*** Electric-fence has detected errors"

 		exit 1

@@ -27,7 +27,7 @@ fi

 # we don't run clamd under electric-fence, it always crashes in free(),

 # probably doesn't work well with libpthread.

 echo "--- running clamscan under electric-fence to detect overruns"

-CLAMSCAN_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamscan.sh

+CLAMSCAN_WRAPPER=$abs_srcdir/preload_run.sh $abs_srcdir/check_clamscan.sh

 if test ! $?; then

 	echo "*** Electric-fence has detected errors"

 	exit 2

@@ -35,7 +35,7 @@ fi

 EF_PROTECT_BELOW=1

 export EF_PROTECT_BELOW

 echo "--- running clamscan under electric-fence to detect underruns"

-CLAMSCAN_WRAPPER=$srcdir/preload_run.sh $srcdir/check_clamscan.sh

+CLAMSCAN_WRAPPER=$abs_srcdir/preload_run.sh $abs_srcdir/check_clamscan.sh

 if test ! $?; then

 	echo "*** Electric-fence has detected errors"

 	exit 3

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

-LogFile /tmp/clamd-test.log

+# script will fill in CWD and X

+LogFile CWD/clamd-test.log

 LogTime yes

 LogClean yes

 LogVerbose yes

-PidFile /tmp/clamd-test.pid

-# We need to use absolute path for RELOAD, the script will fill this in

-# DatabaseDirectory test-db

+PidFile CWD/clamd-test.pid

+DatabaseDirectory CWD/test-db

 LocalSocket clamd-test.socket

 TCPAddr 127.0.0.1

 # using different port here to avoid conflicts with system clamd daemon

-TCPSocket 3311

+TCPSocket 331X

 ExitOnOOM yes

 DetectPUA yes

 ScanPDF yes

@@ -56,20 +56,23 @@ parse_valgrindlog()

 }

-VALGRIND_FLAGS="-v --trace-children=yes --track-fds=yes --leak-check=full --suppressions=$srcdir/valgrind.supp"

-VALGRIND_FLAGS_RACE="-v --tool=helgrind --trace-children=yes --suppressions=$srcdir/valgrind.supp"

+VALGRIND_FLAGS="-v --trace-children=yes --track-fds=yes --leak-check=full --suppressions=$abs_srcdir/valgrind.supp"

+VALGRIND_FLAGS_RACE="-v --tool=helgrind --trace-children=yes --suppressions=$abs_srcdir/valgrind.supp"

 echo "--- Starting check_clamav under valgrind/memcheck"

 rm -f valgrind-check.log valgrind-clamd.log valgrind-race.log

 CK_FORK=no ../libtool --mode=execute $VALGRIND $VALGRIND_FLAGS ./check_clamav >valgrind-check.log 2>&1 &

-pid=$!

+pid1=$!

+

 echo "--- Starting clamd under valgrind/memcheck"

-CLAMD_WRAPPER="$VALGRIND $VALGRIND_FLAGS" $srcdir/check_clamd.sh >valgrind-clamd.log 2>&1

+CLAMD_WRAPPER="$VALGRIND $VALGRIND_FLAGS" $abs_srcdir/check_clamd.sh >valgrind-clamd.log 2>&1 &

+pid2=$!

 echo "--- Starting clamd under valgrind/helgrind"

-CLAMD_WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" $srcdir/check_clamd.sh >valgrind-race.log 2>&1

+CLAMD_TEST_UNIQ1=3 CLAMD_TEST_UNIQ2=4 CLAMD_WRAPPER="$VALGRIND $VALGRIND_FLAGS_RACE" $abs_srcdir/check_clamd.sh >valgrind-race.log 2>&1 &

+pid3=$!

-wait $pid

+wait $pid1 $pid2 $pid3

 parse_valgrindlog valgrind-check.log

 parse_valgrindlog valgrind-clamd.log

 parse_valgrindlog valgrind-race.log

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

 #!/bin/sh

-if test ! "x$CLAM_VIRUSEVENT_FILENAME" = "x$1/../test/clam.exe"; then

+if test ! "x$CLAM_VIRUSEVENT_FILENAME" = "x$1/../../test/clam.exe"; then

 	echo "VirusEvent incorrect: $CLAM_VIRUSEVENT_FILENAME" >$1/test-clamd.log

 	exit 1

 fi