Merge pull request #208 from gemesa/tests

Fix and improve tests

tests/run.sh

@@ -15,6 +15,7 @@ arch=$(uname -m)
 so=$(uname -s) # We use `-s` because `-o` is not supported on Mac OS X
 so=${so#*/}
 version=$(sed -n 's/^.*VERSION \"\([0-9]\.[0-9]*\)\"/\1/p' $INC_DIR/common.h)
+err=0
 
 function test_build
 {
@@ -40,6 +41,7 @@ function test_binary
 		eval ${onsuccess}
 	else
 		eval ${onfailure}
+		err=1
 		return # Stop at error
 	fi
 }
@@ -64,6 +66,7 @@ function test_binary_using_all_formats
 			eval ${onsuccess}
 		else
 			eval ${onfailure}
+			err=1
 			break # Stop at 1st error
 		fi
 	done
@@ -109,6 +112,7 @@ function test_binary_output_against_expected_output
 		eval ${onfailure}
 		#echo "Showing differences:"
 		#head -n 5 tmp.diff
+		err=1
 		return # Stop at error
 	fi
 }
@@ -288,18 +292,23 @@ case "$1" in
 		if [ $# -ne 2 ]
 		then
 			echo "missing argument: use $0 pe32 <binary file>"
+			exit 1
 		else
 			test_pe32 $2
+			exit $err
 		fi
 		;;
 	"pe64")
-		test_pe64 ;;
+		test_pe64
+		exit $err ;;
 	"regression")
 		if [ $# -ne 2 ]
 		then
 			echo "missing argument: use $0 regression <binary file>"
+			exit 1
 		else
 			test_regression $2
+			exit $err
 		fi
 		;;
 	*)

tests/valgrind_pedis.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-prog="valgrind -q ../src/pedis"
+prog="valgrind -q ../src/build/pedis"
 samples=../support_files/samples/*
 
 n=0
@@ -9,13 +9,14 @@ for sample in $samples; do
 
 	echo -e "\n$sample"
 
-	func=$(../src/readpe -f csv -h optional "$sample" | grep Entry | cut -d, -f2)
+	func=$(../src/build/readpe -f csv "$sample" | grep Entry | cut -d, -f2)
 
 	for format in text csv xml html; do
-			$prog -f $format -F $func $sample || let err++
+		$prog -f $format -r $func $sample > /dev/null 2>&1 || let err++
 	done
 
 	let n++
 done
 
 echo "$n samples analyzed. $err errors." > /dev/fd/2
+exit $err

tests/valgrind_pepack.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
-prog="valgrind -q ../src/pepack"
+prog="valgrind -q ../src/build/pepack"
 samples=../support_files/samples/*
 
 n=0
 err=0
 for sample in $samples; do
 
 	echo -e "\n$sample"
-	$prog $sample || let err++
+	$prog $sample > /dev/null 2>&1 || let err++
 	let n++
 done
 
 echo "$n samples analyzed. $err errors." > /dev/fd/2
+exit $err

tests/valgrind_pesec.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-prog="valgrind -q ../src/pesec"
+prog="valgrind -q ../src/build/pesec"
 samples=../support_files/samples/*
 
 n=0
@@ -10,10 +10,11 @@ for sample in $samples; do
 	echo -e "\n$sample"
 
 	for format in text csv xml html; do
-			$prog -f $format $sample || let err++
+		$prog -f $format $sample > /dev/null 2>&1 || let err++
 	done
 
 	let n++
 done
 
 echo "$n samples analyzed. $err errors." > /dev/fd/2
+exit $err

tests/valgrind_readpe.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-readpe="valgrind -q ../src/readpe"
-samples=../support_files/samples/dep.exe
+readpe="valgrind -q ../src/build/readpe"
+samples=../support_files/samples/*
 opts_noarg='-A -H -d -i'
 opts_arg[0]='-h dos'
 opts_arg[1]='-h coff'
@@ -14,25 +14,26 @@ for sample in $samples; do
 	echo $sample
 
 	for opt in $opts_noarg; do
-		$readpe $opt $sample || let err++
+		$readpe $opt $sample > /dev/null 2>&1 || let err++
 	done
 
 	for format in text csv xml html; do
 		for opt in $opts_noarg; do
-			$readpe $opt $sample || let err++
+			$readpe -f $format $opt $sample > /dev/null 2>&1 || let err++
 		done
 	done
 
 	for i in 0 1 2; do
-		$readpe ${opts_arg[i]} $sample
-	for format in text csv xml html; do
-		for opt in $opts_noarg; do
-			$readpe -f $format $opt $sample || let err++
+		$readpe ${opts_arg[i]} $sample > /dev/null 2>&1 || let err++
+		for format in text csv xml html; do
+			for opt in $opts_noarg; do
+				$readpe -f $format $opt ${opts_arg[i]} $sample > /dev/null 2>&1 || let err++
+			done
 		done
 	done
-	done
 	let n++
 
 done
 
 echo "$n samples analyzed. $err errors." > /dev/fd/2
+exit $err