Resolve L2SDP-971

Closes L2SDP-971

regressiontest/fw_regressiontest.sh

@@ -255,32 +255,61 @@ restart_sdptr() {
 }
 
 look_for_success() {
-    success="true"
+    # ignore case
+    local orig_nocasematch=$(shopt -p nocasematch; true)
+    shopt -s nocasematch
+
+    success=
     while read -r line; do
         if [[ -n "${line}" ]]; then
-           [[ "${line}" = *"FAILED"* ]] && success= 
+           [[ "${line}" = *"PASSED"* ]] && success="true" 
+           [[ "${line}" = *"SUCCESS"* ]] && success="true" 
         fi
-    done < test.log 
+    done < ${logfile_nr}
+    
+    # set back original nocasematch
+    $orig_nocasematch
     echo "${success}"
 }
 
+look_for_failure() {
+    # ignore case
+    local orig_nocasematch=$(shopt -p nocasematch; true)
+    shopt -s nocasematch
+
+    failure=
+    while read -r line; do
+        if [[ -n "${line}" ]]; then
+           [[ "${line}" = *"FAILED"* ]] && failure="true" 
+           [[ "${line}" = *"ERROR"* ]] && failure="true" 
+        fi
+    done < ${logfile_nr} 
+
+    # set back original nocasematch
+    $orig_nocasematch
+    echo "${failure}"
+}
+
 run_test() {
     echo "Run all tests from fw_tests.txt"
     echo "-" >> ${MAILFILE}
     echo "Run all tests from fw_tests.txt" >> ${MAILFILE}
     test_sucess="true"
+    test_nr=0
+    
     # substitude env variables
     envsubst < ${TESTFILE} > ${EXPTESTFILE}
-    
     # skip lines starting with #
     grep -v '^#' < ${EXPTESTFILE} > ${EXPTESTFILE_CLEAN}
     
     while read -r line; do
         if [[ -n "${line}" ]]; then
+            let "test_nr = test_nr + 1"
+            logfile_nr="test${test_nr}.log"
             echo "Run test: ${line}"
             echo "Run test: ${line}" >> ${MAILFILE}
-            ${line} > test.log
-            if [[ -n $(look_for_success) ]]; then
+            ${line} &> ${logfile_nr}
+            if [[ -n $(look_for_success) ]] && [[ -z $(look_for_failure) ]]; then
                 echo "-  SUCCESS"
                 echo "-  SUCCESS" >> ${MAILFILE}
             else
@@ -313,7 +342,8 @@ else
     test_sucess=
 
     # run selected options
-    [[ -n "${flash}" ]] && flash_fw && reload_fw
+    # [[ -n "${flash}" ]] && flash_fw && reload_fw
+    [[ -n "${flash}" ]] && reload_fw
     [[ -n "${sdptr}" ]] && restart_sdptr
     [[ -n "${test}" ]] && sleep 20 && run_test