X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=contrib%2Flogtesting%2Fdotests.sh;h=2d40853919f296cc16a3504d09f4f4162aefccf6;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=e0c65a9717caf00680cee8cf319f9c6d315e35a7;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/contrib/logtesting/dotests.sh b/contrib/logtesting/dotests.sh
index e0c65a9..2d40853 100755
--- a/contrib/logtesting/dotests.sh
+++ b/contrib/logtesting/dotests.sh
@@ -1,13 +1,30 @@
 #!/bin/sh
 
+hostname=`hostname`
+hostname melancia
+
+cleanup() {
+    hostname $hostname
+    rm -f ./tmpres
+}
+
+trap "cleanup" INT TERM EXIT
+exitcode=0
+
+if diff --help 2>&1 | grep -q -- --color; then
+    diff_cmd='diff --color'
+else
+    diff_cmd='diff'
+fi
+
 echo "Starting log unit tests (must be run as root and on a system with OSSEC installed)."
-echo "(it will make sure the current rules aree working as they should)."
+echo "(it will make sure the current rules are working as they should)."
 rm -f ./tmpres
 for i in ./*/log; do
     idir=`dirname $i`
 
     rm -f ./tmpres || exit "Unable to remove tmpres.";
-    cat $i | /var/ossec/bin/ossec-logtest 2>&1|grep -v ossec-testrule |grep -A 500 "Phase 1:" > ./tmpres
+    cat $i | /var/ossec/bin/ossec-logtest 2>&1|grep -av ossec-testrule |grep -aA 500 "Phase 1:" > ./tmpres
 
     if [ ! -f $idir/res ]; then
         echo "** Creating entry for $i - Not set yet."
@@ -19,17 +36,22 @@ for i in ./*/log; do
     MD2=`md5sum $idir/res | cut -d " " -f 1`
 
     if [ ! $MD1 = $MD2 ]; then
+        exitcode=1
+        echo
+        echo
+        echo
         echo "**ERROR: Unit testing failed. Output for the test $i failed."
-        echo "== OLD OUTPUT: =="
-        cat $idir/res
-	echo "== NEW OUTPUT: =="
-        cat tmpres
-        echo "** ERROR: Exiting."
+        echo "== DIFF OUTPUT: =="
+        $diff_cmd -Na -U `wc -l $idir/res` tmpres
         rm -f tmpres
-        exit 0;
     fi
 
 done
 
 echo ""
-echo "Log unit tests completed. Everything seems ok (nothing changed since last test regarding the outputs)."
+if [ $exitcode -eq 0 ]; then
+    echo "Log unit tests completed. Everything seems ok (nothing changed since last test regarding the outputs)."
+else
+    echo "Log unit tests completed. Some tests failed."
+fi
+exit $exitcode