Fix run-aa-test

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>

run-aa-test

@@ -12,9 +12,7 @@ ALTERNATIVE_SEPARATOR="## alternative ##"
 END=2
 
 case $(echo ${LAUNCH_DBUS} | tr [A-Z] [a-z]) in
-0)
-no)
-false)
+0 | no | false)
 	LAUNCH_DBUS="False"
 	;;
 *)
@@ -22,9 +20,7 @@ false)
 esac
 
 case $(echo ${RUN_AS_USER} | tr [A-Z] [a-z]) in
-0)
-no)
-false)
+0 | no | false)
 	RUN_AS_USER="False"
 	;;
 *)
@@ -35,8 +31,8 @@ CHAIWALA_UID=1000
 CHAIWALA_USER="user"
 
 # Check parameters
-if [ $# -lt 3 ]; then
-echo 
+if [ $# -lt 2 ]; then
+
 	echo "Usage: run-aa-test <expectation-file> <command> <argument-1> <argument-2> …"
 	echo "\"export LAUNCH_DBUS=no\" in the test script to not launch a dbus session."
 	echo "\"export RUN_AS_USER=no\" in the test script to not run as ${CHAIWALA_USER}"
@@ -112,7 +108,8 @@ CMDLINE="${CMDLINE} ${CMD}"
 
 echo "#=== running test script: ${CMDLINE} ==="
 
-RET=$( setsid ${CMDLINE} )
+setsid ${CMDLINE}
+RET=$?
 
 echo "#--- end of test script, status: ${RET}"
 
@@ -147,7 +144,7 @@ cp ${EXPECT_FILE} ${EXPECT_SPLIT_DIR}/REMAIN
 
 EXPECT_COUNT=1
 
-SEPARATOR=$( grep -m1 -x -n "${ALTERNATIVE_SEPARATOR}" //REMAIN | cut -d: -f1 )
+SEPARATOR=$( grep -m1 -x -n "${ALTERNATIVE_SEPARATOR}" ${EXPECT_SPLIT_DIR}/REMAIN | cut -d: -f1 )
 while [ "${SEPARATOR}" != "" ]; do
 	echo "SEPARATOR=\"${SEPARATOR}\""
 	echo "REMAIN:"
@@ -190,17 +187,17 @@ echo "#---8<--- actual output from aa_log_extract_tokens.pl"
 cat ${PARSE_FILE} | sed 's/^/# /'
 echo "#--->8---"
 
-MATCH_EXPECTATION = "False"
+MATCH_EXPECTATION="False"
 
 # We might have alternative expectations, take that into consideration.
 OUTPUT_MD5=$( cat ${PARSE_FILE} | md5sum )
 COUNT=$( ls -1 ${EXPECT_SPLIT_DIR}/EXPECT* | wc -l )
 NUM=1
-while [ $NUM <= $COUNT ]; do
+while [ $((${NUM} <= ${COUNT})) = 1 ]; do
 	EXPECTED_MD5=$( cat ${EXPECT_SPLIT_DIR}/EXPECT${NUM} | md5sum )
 	if [ "${OUTPUT_MD5}" = "${EXPECTED_MD5}" ]; then
 		echo "# audit log matches alternative expectation ${NUM}/${COUNT}"
-		MATCH_EXPECTATION = "True"
+		MATCH_EXPECTATION="True"
 	fi
 	NUM=$((${NUM}+1))
 done
@@ -209,7 +206,7 @@ if [ "${MATCH_EXPECTATION}" = "True" ]; then
 	echo "${TEST_TITLE}: pass"
 else
 	echo "#---8<--- diff"
-	diff -urN 
+	diff -urN ${EXPECT_SPLIT_DIR}/EXPECT${NUM} ${PARSE_FILE}
 	echo "#--->8---"
 	echo "${TEST_TITLE}: fail"
 	SOMETHING_FAILED="True"