libhugetlbfs: results parser fix with minimal egrep

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

1 files changed, 9 insertions, 5 deletions

diff --git a/automated/linux/libhugetlbfs/libhugetlbfs.sh b/automated/linux/libhugetlbfs/libhugetlbfs.sh
index f2e97a0..156c3c6 100755
--- a/automated/linux/libhugetlbfs/libhugetlbfs.sh
+++ b/automated/linux/libhugetlbfs/libhugetlbfs.sh
@@ -6,6 +6,7 @@
 OUTPUT="$(pwd)/output"
 RESULT_FILE="${OUTPUT}/result.txt"
 RESULT_LOG="${OUTPUT}/result_log.txt"
+TMP_RESULT_LOG="${OUTPUT}/tmp_result_log.txt"
 TEST_PASS_LOG="${OUTPUT}/test_pass_log.txt"
 TEST_FAIL_LOG="${OUTPUT}/test_fail_log.txt"
 TEST_SKIP_LOG="${OUTPUT}/test_skip_log.txt"
@@ -28,28 +29,31 @@ while getopts "b:s:v:" o; do
 done
 
 parse_output() {
+    # Skip test results summary
+    egrep "TEST SUMMARY" -B500 "${TMP_RESULT_LOG}" | tee -a "${RESULT_LOG}"
     # Parse each type of results
-    egrep "*:.*PASS" "${RESULT_LOG}" | tee -a "${TEST_PASS_LOG}"
+    egrep "PASS" "${RESULT_LOG}" | tee -a "${TEST_PASS_LOG}"
     sed -i -e 's/ (inconclusive)//g' "${TEST_PASS_LOG}"
     sed -i -e 's/(//g' "${TEST_PASS_LOG}"
     sed -i -e 's/)://g' "${TEST_PASS_LOG}"
     sed -i -e 's/://g' "${TEST_PASS_LOG}"
     awk '{for (i=1; i<NF-1; i++) printf $i "-"; print $i " " $NF}' "${TEST_PASS_LOG}" 2>&1 | tee -a "${RESULT_FILE}"
 
-    egrep "*:.*FAIL" "${RESULT_LOG}" | cut -d: -f 1-2 2>&1 | tee -a "${TEST_FAIL_LOG}"
+    egrep "FAIL" "${RESULT_LOG}" | cut -d: -f 1-2 2>&1 | tee -a "${TEST_FAIL_LOG}"
     sed -i -e 's/ (inconclusive)//g' "${TEST_FAIL_LOG}"
     sed -i -e 's/(//g' "${TEST_FAIL_LOG}"
     sed -i -e 's/)//g' "${TEST_FAIL_LOG}"
     sed -i -e 's/://g' "${TEST_FAIL_LOG}"
     awk '{for (i=1; i<NF; i++) printf $i "-"; print $i " " "FAIL"}' "${TEST_FAIL_LOG}" 2>&1 | tee -a "${RESULT_FILE}"
 
-    egrep "*:.*SKIP" "${RESULT_LOG}" | cut -d: -f 1-2 2>&1 | tee -a "${TEST_SKIP_LOG}"
-    egrep "*:.*Bad configuration" "${RESULT_LOG}" | cut -d: -f 1-2 2>&1 | tee -a "${TEST_SKIP_LOG}"
+    egrep "SKIP" "${RESULT_LOG}" | cut -d: -f 1-2 2>&1 | tee -a "${TEST_SKIP_LOG}"
+    egrep "Bad configuration" "${RESULT_LOG}" | cut -d: -f 1-2 2>&1 | tee -a "${TEST_SKIP_LOG}"
     sed -i -e 's/ (inconclusive)//g' "${TEST_SKIP_LOG}"
     sed -i -e 's/(//g' "${TEST_SKIP_LOG}"
     sed -i -e 's/)//g' "${TEST_SKIP_LOG}"
     sed -i -e 's/://g' "${TEST_SKIP_LOG}"
     awk '{for (i=1; i<NF; i++) printf $i "-"; print $i " " "SKIP"}' "${TEST_SKIP_LOG}" 2>&1 | tee -a "${RESULT_FILE}"
+    rm -rf "${TMP_RESULT_LOG}" "${RESULT_LOG}" "${TEST_PASS_LOG}" "${TEST_FAIL_LOG}" "${TEST_SKIP_LOG}"
 }
 
 libhugetlbfs_setup() {
@@ -84,7 +88,7 @@ libhugetlbfs_run_test() {
     cd tests
     # Run tests
     # Redirect stdout (not stderr)
-    ./run_tests.py -b "${WORD_SIZE}" | tee -a "${RESULT_LOG}"
+    ./run_tests.py -b "${WORD_SIZE}" | tee -a "${TMP_RESULT_LOG}"
     parse_output
 }