fix dmesg collecting

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

Author: ekurdybx

case-lib/lib.sh

@@ -118,14 +118,12 @@ start_test()
     # Only start the polling for firmware boot complete when SOF soundcard is not available
     # setup_kernel_check_point has already -1 second to avoid TOCTOU race condition
     [ -n "$NO_POLL_FW_LOADING" ] || is_sof_used || {
-        setup_kernel_check_point
         if poll_wait_for 1 "$MAX_WAIT_FW_LOADING" sof_firmware_boot_complete --since=@"$KERNEL_CHECKPOINT"; then
             dlogi "Good to start the test, FW is loaded!"
         else
             die "FW is not loaded for $MAX_WAIT_FW_LOADING"
         fi
     }
-    func_kmsg_collect
 
     export SOF_TEST_TOP_PID="$$"
     local prefix; prefix="ktime=$(ktime) sof-test PID=${SOF_TEST_TOP_PID}"
@@ -159,6 +157,8 @@ start_test()
     dlogi "$start_msg"
     logger -p user.info "$start_msg"
 
+    setup_kernel_check_point
+    func_kmsg_collect
 }
 
 # See high-level description in start_test header above
@@ -201,11 +201,8 @@ stop_test()
 
 finish_kmsg_collection()
 {
-    if [[ -n "$DMESG_PID" ]]; then
-        kill "$DMESG_PID" 2>/dev/null
-        wait "$DMESG_PID" 2>/dev/null
-        unset KERNEL_CHECKPOINT
-    fi
+    dlogi "Finishing dmesg collection"
+    sudo pkill -9 journalctl
 
     local journalctl_logs="$LOG_ROOT/dmesg.txt"
     if test -s "${journalctl_logs}"; then
@@ -435,14 +432,9 @@ func_kmsg_collect() {
     if [[ "$KERNEL_CHECKPOINT" =~ ^[0-9]{10} ]]; then
         dlogi "Saving kernel messages since ${KERNEL_CHECKPOINT} to ${journalctl_logs}"
         journalctl_cmd --since=@"$KERNEL_CHECKPOINT" -f >> "${journalctl_logs}" &
-    elif [[ "$KERNEL_CHECKPOINT" == "disabled" ]]; then
-        dlogi "Saving all kernel messages"
-        journalctl_cmd -f >> "${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
-        return
+        dlogi "KERNEL_CHECKPOINT is not properly set, saving all kernel messages"
+        journalctl_cmd -f >> "${journalctl_logs}" &
     fi
     DMESG_PID=$!
 }

test-case/check-8bit-play-rec.sh

@@ -116,7 +116,6 @@ main()
 
     logger_disabled || func_lib_start_log_collect
 
-    setup_kernel_check_point
     func_lib_check_sudo
     func_pipeline_export "$tplg" "type:any"
 

test-case/check-alsa-conformance.sh

@@ -325,8 +325,6 @@ main()
 {
   init_globals
 
-  setup_kernel_check_point
-
   start_test
 
   check_alsa_conformance_suite

test-case/check-alsabat.sh

@@ -61,7 +61,6 @@ OPT_NAME['s']='sof-logger'      OPT_DESC['s']="Open sof-logger trace the data wi
 OPT_HAS_ARG['s']=0             OPT_VAL['s']=1
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 pcm_p=${OPT_VAL['p']}
 pcm_c=${OPT_VAL['c']}

test-case/check-audio-equalizer.sh

@@ -44,7 +44,6 @@ func_pipeline_export "$tplg" "eq:any"
 sofcard=${SOFCARD:-0}
 
 start_test
-setup_kernel_check_point
 
 # Test equalizer
 func_test_eq()

test-case/check-capture.sh

@@ -75,7 +75,6 @@ if [[ -n "$new_tplg_filename" && "$TPLG" != *nocodec* ]]; then
 fi
 logger_disabled || func_lib_start_log_collect
 
-setup_kernel_check_point
 func_lib_check_sudo
 func_pipeline_export "$tplg" "type:capture & ${OPT_VAL['S']}"
 

test-case/check-float-play-rec.sh

@@ -91,7 +91,6 @@ main()
 
     logger_disabled || func_lib_start_log_collect
 
-    setup_kernel_check_point
     func_lib_check_sudo
     func_pipeline_export "$tplg" "type:any"
 

test-case/check-fw-echo-reference.sh

@@ -44,7 +44,6 @@ start_test
 logger_disabled || func_lib_start_log_collect
 
 func_pipeline_export "$tplg" "echo:any"
-setup_kernel_check_point
 
 if [ "$PIPELINE_COUNT" != "2" ]; then
     die "Only detect $PIPELINE_COUNT pipeline(s) from topology, but two are needed"

test-case/check-ipc-flood.sh

@@ -28,7 +28,6 @@ OPT_NAME['l']='loop'     OPT_DESC['l']='loop count'
 OPT_HAS_ARG['l']=1         OPT_VAL['l']=1
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 lpc_loop_cnt=${OPT_VAL['c']}
 ipc_flood_dfs=${OPT_VAL['f']}

test-case/check-keyword-detection.sh

@@ -44,7 +44,6 @@ OPT_NAME['d']='duration'          OPT_DESC['d']='interrupt kwd pipeline in # sec
 OPT_HAS_ARG['d']=1                  OPT_VAL['d']=10
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 tplg=${OPT_VAL['t']}
 loop_cnt=${OPT_VAL['l']}