portability fixes

git-svn: trunk@4194

unit_tests/Makefile.am

@@ -9,7 +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_ENVIRONMENT=export abs_srcdir=$(abs_srcdir) AWK=$(AWK);
 TESTS = $(programs) $(scripts)
 check_PROGRAMS = $(programs)
 check_SCRIPTS = $(scripts)

unit_tests/Makefile.in

@@ -231,7 +231,7 @@ 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_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK);
 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

unit_tests/check_clamd.sh

@@ -17,7 +17,7 @@ killclamd() {
 	pippo=0
 	while kill -0 $pid 2>/dev/null; do
 		sleep 1
-		pippo=$((pippo+1))
+		pippo=`expr $pippo + 1`
 		if test $pippo -gt 9; then
 			kill -KILL $pid
 		fi
@@ -121,7 +121,7 @@ aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File
 EOF
 	cp $abs_srcdir/input/daily.ftm test-db/
 	cp $abs_srcdir/input/daily.pdb test-db/
-	awk "{ sub(/X/,\"$1\"); sub(/CWD/,\"`pwd`\"); print }" $abs_srcdir/test-clamd.conf >test-clamd.conf
+	$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