[PATCH] bzip2: modify run-tests script

[Rahul Kumar]

1) modify run-tests script to write PASS/FAIL as expected by the ptest infrastructure

2) Since the discrete md5sum does not have a short form of --status.And minimal base
   images does not support commands with long form arguments so dropping this
   argument

Signed-off-by: Rahul Kumar <rahulk@mvista.com>
---
 run-tests.sh | 62 ++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/run-tests.sh b/run-tests.sh
index 1ba8c27..771584d 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -40,21 +40,21 @@ case $i in
 esac
 done
 
-if ! type "valgrind" > /dev/null; then
+if ! type "valgrind" > /dev/null 2>&1; then
   VALGRIND=""
   VALGRIND_ARGS=""
 fi
 
 echo "Testing ${BZIP2} in directory ${TESTS_DIR}"
 if [ "$VALGRIND" != "" ]; then
-  echo "  using valgrind"
+  echo "Using valgrind: Yes"
 else
-  echo "  NOT using valgrind"
+  echo "Using valgrind: No"
 fi
 if [[ ${IGNORE_MD5} -eq 0 ]]; then
-  echo "  checking md5 sums"
+  echo "Checking md5 sums: Yes"
 else
-  echo "  NOT checking md5 sums"
+  echo "Checking md5 sums: No"
 fi
 
 # Remove any left over tesfilecopies from previous runs first.
@@ -78,14 +78,14 @@ while IFS= read -r -d '' bzfile; do
   # Decompress it.
   echo "  Decompress..."
   rm -f "${file}"
-  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q ${bzfile} \
-    || { echo "!!! bad decompress result $?";
+  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q ${bzfile} && { echo "PASS: ${bzfile} Decompress"; } \
+    || { echo "FAIL: ${bzfile} Decompress";
          badtests=("${badtests[@]}" $"${bzfile} bad decompress result")
          nogood=$[${nogood}+1]; continue; }
 
   if [[ ${IGNORE_MD5} -ne 1 ]]; then
-    md5sum --check --status ${md5file} < ${file} \
-      || { echo "!!! md5sum doesn't match decompressed file";
+    md5sum -c ${md5file} < ${file} && { echo "PASS: ${bzfile} md5sum Matched"; } \
+      || { echo "FAIL: ${bzfile} md5sum Matched";
            badtests=("${badtests[@]}" $"${file} md5sum doesn't match")
            nogood=$[${nogood}+1]; continue; }
   fi
@@ -94,19 +94,19 @@ while IFS= read -r -d '' bzfile; do
   mv "${file}" "${copy}"
   rm -f "${bzcopy}"
   echo "  Recompress..."
-  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} \
-    || { echo "!!! bad compress result $?";
+  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} && { echo "PASS: ${bzfile} Recompress "; } \
+    || { echo "FAIL: ${bzfile} Recompress";
          badtests=("${badtests[@]}" $"${copy} bad result")
          nogood=$[${nogood}+1]; continue; }
   echo "  Redecompress..."
-  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} \
-    || { echo "!!! bad (re)decompress result $?";
+  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} && { echo "PASS: ${bzfile} Redecompress"; } \
+    || { echo "FAIL: ${bzfile} Redecompress";
          badtests=("${badtests[@]}" $"${bzcopy} bad result")
          nogood=$[${nogood}+1]; continue; }
 
   if [[ ${IGNORE_MD5} -ne 1 ]]; then
-    md5sum --check --status ${md5file} < ${copy} \
-      || { echo "!!! md5sum doesn't match (re)decompressed file";
+    md5sum -c ${md5file} < ${copy} && { echo "PASS: ${bzfile} md5sum Matched"; } \
+      || { echo "FAIL: ${bzfile} md5sum Matched";
            badtests=("${badtests[@]}" $"${copy} md5sum doesn't match")
            nogood=$[${nogood}+1]; continue; }
   fi
@@ -116,14 +116,14 @@ while IFS= read -r -d '' bzfile; do
   # Now do it all again in "small" mode.
   echo "  Decompress (small)..."
   rm -f "${file}"
-  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q -s ${bzfile} \
-    || { echo "!!! bad decompress result $?";
+  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q -s ${bzfile} &&{ echo "PASS: ${bzfile} Decompress (small)"; } \
+    || { echo "FAIL: ${bzfile} Decompress (small)";
          badtests=("${badtests[@]}" $"${bzfile} bad decompress result")
          nogood=$[${nogood}+1]; continue; }
 
   if [[ ${IGNORE_MD5} -ne 1 ]]; then
-    md5sum --check --status ${md5file} < ${file} \
-      || { echo "!!! md5sum doesn't match decompressed file";
+    md5sum -c ${md5file} < ${file} && { echo "PASS: ${bzfile} Md5sum Matched"; } \
+      || { echo "FAIL: ${bzfile} Md5sum Matched";
            badtests=("${badtests[@]}" $"${file} md5sum doesn't match")
            nogood=$[${nogood}+1]; continue; }
   fi
@@ -132,19 +132,19 @@ while IFS= read -r -d '' bzfile; do
   mv "${file}" "${copy}"
   rm -f "${bzcopy}"
   echo "  Recompress (small)..."
-  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} \
-    || { echo "!!! bad compress result $?";
+  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} && { echo "PASS: ${bzfile} Recompress (small)"; } \
+    || { echo "FAIL: ${bzfile} Recompress (small)";
          badtests=("${badtests[@]}" $"${copy} bad result")
          nogood=$[${nogood}+1]; continue; }
   echo "  Redecompress (small)..."
-  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} \
-    || { echo "!!! bad (re)decompress result $?";
+  ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} && { echo "PASS: ${bzfile} Redecompress (small)"; } \
+    || { echo "FAIL: ${bzfile} Redecompress (small)";
          badtests=("${badtests[@]}" $"${bzcopy} bad result")
          nogood=$[${nogood}+1]; continue; }
 
   if [[ ${IGNORE_MD5} -ne 1 ]]; then
-    md5sum --check --status ${md5file} < ${copy} \
-      || { echo "!!! md5sum doesn't match (re)decompressed file";
+    md5sum -c ${md5file} < ${copy} && { echo "PASS: ${bzfile} md5sum Matched"; } \
+      || { echo "FAIL: ${bzfile} md5sum : Miss Matched";
            badtests=("${badtests[@]}" $"${copy} md5sum doesn't match")
            nogood=$[${nogood}+1]; continue; }
   fi
@@ -176,7 +176,7 @@ while IFS= read -r -d '' badfile; do
   ret=$?
 
   if [[ ${ret} -eq 0 ]]; then
-    echo "!!! badness not detected"
+    echo "FAIL: badness not detected"
     nobad=$[${nobad}+1]
     badtests=("${badtests[@]}" $"${badfile} badness not detected")
     continue
@@ -185,10 +185,12 @@ while IFS= read -r -d '' badfile; do
   # Assumes "normal" badness is detected by exit code 1 or 2.
   # A crash or valgrind issue will be reported with something else.
   if [[ ${ret} != 1 ]] && [[ ${ret} != 2 ]]; then
-    echo "!!! baddness caused baddness in ${BZIP2}"
+    echo "FAIL: baddness caused baddness in ${BZIP2}"
     badbad=$[${badbad}+1]
     badtests=("${badtests[@]}" $"${badfile} badness caused baddness")
     continue
+  else
+    echo "PASS: Correctly found data integrity errors in ${badfile} during decompress."
   fi
 
   echo "  Trying to decompress (small)..."
@@ -196,7 +198,7 @@ while IFS= read -r -d '' badfile; do
   ret=$?
 
   if [[ ${ret} -eq 0 ]]; then
-    echo "!!! badness not detected"
+    echo "FAIL: badness not detected "
     nobad=$[${nobad}+1]
     badtests=("${badtests[@]}" $"${badfile} badness not detected")
     continue
@@ -205,10 +207,12 @@ while IFS= read -r -d '' badfile; do
   # Assumes "normal" badness is detected by exit code 1 or 2.
   # A crash or valgrind issue will be reported with something else.
   if [[ ${ret} != 1 ]] && [[ ${ret} != 2 ]]; then
-    echo "!!! baddness caused baddness in ${BZIP2}"
+    echo "FAIL: baddness caused baddness in ${BZIP2}"
     badbad=$[${badbad}+1]
     badtests=("${badtests[@]}" $"${badfile} badness caused baddness")
     continue
+  else
+    echo "PASS: Correctly found data integrity errors in ${badfile} during decompress (small)"
   fi
 
 done < <(find ${TESTS_DIR} -type f -name \*\.bz2.bad -print0)
-- 
2.7.4