lib.sh: run func_exit_handler on sigterm

Signed-off-by: Emilia Kurdybelska <emiliax.kurdybelska@intel.com>

Author: ekurdybx

case-lib/hijack.sh

@@ -8,10 +8,37 @@ SUDO_CMD=$(command -v sudo)
 # re-use separately instead of all this or nothing.
 function func_exit_handler()
 {
+    trap - EXIT SIGTERM
     local exit_status=${1:-0}
 
     dlogi "Starting func_exit_handler($exit_status)"
 
+    local journalctl_logs="$LOG_ROOT/dmesg.txt"
+    if [[ "$KERNEL_CHECKPOINT" =~ ^[0-9]{10} ]]; then
+        # Do not collect the entire duration of the test but only the
+        # last iteration.
+        dlogi "Save kernel messages since ${KERNEL_CHECKPOINT} to ${journalctl_logs}"
+        journalctl_cmd --since=@"$KERNEL_CHECKPOINT" > "${journalctl_logs}"
+    elif [[ "$KERNEL_CHECKPOINT" == "disabled" ]]; then
+        dlogi "Save all kernel messages to ${journalctl_logs}"
+        journalctl_cmd > "${journalctl_logs}"
+    else
+       dloge 'Kernel check point "KERNEL_CHECKPOINT" is not properly set'
+       dloge "KERNEL_CHECKPOINT=$KERNEL_CHECKPOINT"
+       test "$exit_status" -ne 0 || exit_status=1
+    fi
+    if test -s "${journalctl_logs}"; then
+       wcLog=$(wc -l "${journalctl_logs}")
+       dlogi  "nlines=$wcLog"
+    else
+       dlogw "Empty ${journalctl_logs}"
+    fi
+    # Make sure the logs are written on disk just in case of DUT power reset.
+    sync
+
+    # After log collected, KERNEL_CHECKPOINT will not be used any more
+    unset KERNEL_CHECKPOINT
+
     func_lib_check_and_disable_pipewire
 
     # call trace
@@ -134,31 +161,31 @@ function func_exit_handler()
         storage_checks || exit_status=1
     fi
 
-    local journalctl_logs="$LOG_ROOT/dmesg.txt"
-    if [[ "$KERNEL_CHECKPOINT" =~ ^[0-9]{10} ]]; then
-        # Do not collect the entire duration of the test but only the
-        # last iteration.
-        dlogi "Save kernel messages since ${KERNEL_CHECKPOINT} to ${journalctl_logs}"
-        journalctl_cmd --since=@"$KERNEL_CHECKPOINT" > "${journalctl_logs}"
-    elif [[ "$KERNEL_CHECKPOINT" == "disabled" ]]; then
-        dlogi "Save all kernel messages to ${journalctl_logs}"
-        journalctl_cmd > "${journalctl_logs}"
-    else
-       dloge 'Kernel check point "KERNEL_CHECKPOINT" is not properly set'
-       dloge "KERNEL_CHECKPOINT=$KERNEL_CHECKPOINT"
-       test "$exit_status" -ne 0 || exit_status=1
-    fi
-    if test -s "${journalctl_logs}"; then
-       wcLog=$(wc -l "${journalctl_logs}")
-       dlogi  "nlines=$wcLog"
-    else
-       dlogw "Empty ${journalctl_logs}"
-    fi
-    # Make sure the logs are written on disk just in case of DUT power reset.
-    sync
-
-    # After log collected, KERNEL_CHECKPOINT will not be used any more
-    unset KERNEL_CHECKPOINT
+    # local journalctl_logs="$LOG_ROOT/dmesg.txt"
+    # if [[ "$KERNEL_CHECKPOINT" =~ ^[0-9]{10} ]]; then
+    #     # Do not collect the entire duration of the test but only the
+    #     # last iteration.
+    #     dlogi "Save kernel messages since ${KERNEL_CHECKPOINT} to ${journalctl_logs}"
+    #     journalctl_cmd --since=@"$KERNEL_CHECKPOINT" > "${journalctl_logs}"
+    # elif [[ "$KERNEL_CHECKPOINT" == "disabled" ]]; then
+    #     dlogi "Save all kernel messages to ${journalctl_logs}"
+    #     journalctl_cmd > "${journalctl_logs}"
+    # else
+    #    dloge 'Kernel check point "KERNEL_CHECKPOINT" is not properly set'
+    #    dloge "KERNEL_CHECKPOINT=$KERNEL_CHECKPOINT"
+    #    test "$exit_status" -ne 0 || exit_status=1
+    # fi
+    # if test -s "${journalctl_logs}"; then
+    #    wcLog=$(wc -l "${journalctl_logs}")
+    #    dlogi  "nlines=$wcLog"
+    # else
+    #    dlogw "Empty ${journalctl_logs}"
+    # fi
+    # # Make sure the logs are written on disk just in case of DUT power reset.
+    # sync
+
+    # # After log collected, KERNEL_CHECKPOINT will not be used any more
+    # unset KERNEL_CHECKPOINT
 
     # get ps command result as list
     local -a cmd_lst

case-lib/lib.sh

@@ -97,7 +97,7 @@ start_test()
     }
 
     # func_exit_handler() is in hijack.sh
-    trap 'func_exit_handler $?' EXIT
+    trap 'func_exit_handler $?' EXIT SIGTERM
 
     if test -z "$MAX_WAIT_FW_LOADING"; then
         local _pltf; _pltf=$("$SCRIPT_HOME/tools/sof-dump-status.py" -p)