some more portabiility fixes

git-svn: trunk@4195

unit_tests/check_clamd.sh

@@ -214,7 +214,7 @@ 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
+if test $exitcode1 -ne 0 || test $exitcode2 -ne 0; then
 	exit 1
 fi
 exit 0

unit_tests/efence_tests.sh

@@ -15,7 +15,7 @@ EF_FREE_WIPES=1
 LIBPRELOAD="$LIBEFENCE"
 export EF_FREE_WIPES LIBPRELOAD EF_DISABLE_BANNER
 VALGRIND=`which ${VALGRIND-valgrind}`
-if test ! -n "$VALGRIND" -o ! -x "$VALGRIND"; then
+if test ! -n "$VALGRIND" || test ! -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 $abs_srcdir/preload_run.sh ./check_clamav

unit_tests/valgrind_tests.sh

@@ -17,7 +17,7 @@ parse_valgrindlog()
 		echo "*** Logfile $1 not found. Valgrind failed to run?"
 	fi
 	NRUNS=`grep "ERROR SUMMARY" $1 | wc -l`
-	if test $NRUNS -eq `grep "ERROR SUMMARY: 0 errors" $1 | wc -l` -a `grep "FATAL:" $1|wc -l ` -eq 0; then
+	if test $NRUNS -eq `grep "ERROR SUMMARY: 0 errors" $1 | wc -l` && test `grep "FATAL:" $1|wc -l ` -eq 0; then
 		if test "$1" = "valgrind-race.log" || 
 			test $NRUNS -eq `grep "no leaks are possible" $1 | wc -l` ||
 			test `grep "lost:" $1 | grep -v "0 bytes" | wc -l` -eq 0; then 
@@ -74,7 +74,7 @@ parse_valgrindlog valgrind-check.log
 parse_valgrindlog valgrind-clamd.log
 parse_valgrindlog valgrind-race.log
 
-if test -f valgrind-check.log -o -f valgrind-race.log -o -f valgrind-clamd.log; then
+if test -f valgrind-check.log || test -f valgrind-race.log || test -f valgrind-clamd.log; then
 	exit 1;
 fi
 exit 0