fix dmesg collecting

ekurdybx · ekurdybx · commit 00a3dbd6c6a5 · 2026-03-12T15:02:28.000+01:00
Signed-off-by: Emilia Kurdybelska &lt;emiliax.kurdybelska@intel.com&gt;
diff --git a/case-lib/lib.sh b/case-lib/lib.sh
@@ -83,6 +83,9 @@ minvalue() { printf '%d' $(( "$1" < "$2"  ? "$1" : "$2" )); }
 #
 start_test()
 {
+    setup_kernel_check_point
+    func_kmsg_collect
+
     if [ "$SOF_TEST_PIPEWIRE" == true ]; then
         func_lib_enable_pipewire
     fi
@@ -125,7 +128,6 @@ start_test()
             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}"
@@ -158,7 +160,6 @@ start_test()
     local start_msg="$prefix: starting"
     dlogi "$start_msg"
     logger -p user.info "$start_msg"
-
 }
 
 # See high-level description in start_test header above
@@ -201,11 +202,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 +433,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=$!
 }
diff --git a/test-case/check-8bit-play-rec.sh b/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"
 
diff --git a/test-case/check-alsa-conformance.sh b/test-case/check-alsa-conformance.sh
@@ -325,8 +325,6 @@ main()
 {
   init_globals
 
-  setup_kernel_check_point
-
   start_test
 
   check_alsa_conformance_suite
diff --git a/test-case/check-alsabat.sh b/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']}
diff --git a/test-case/check-audio-equalizer.sh b/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()
diff --git a/test-case/check-capture.sh b/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']}"
 
diff --git a/test-case/check-float-play-rec.sh b/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"
 
diff --git a/test-case/check-fw-echo-reference.sh b/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"
diff --git a/test-case/check-ipc-flood.sh b/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']}
diff --git a/test-case/check-keyword-detection.sh b/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']}
diff --git a/test-case/check-kmod-load-unload.sh b/test-case/check-kmod-load-unload.sh
@@ -36,7 +36,6 @@ OPT_NAME['p']='pulseaudio'   OPT_DESC['p']='disable pulseaudio on the test proce
 OPT_HAS_ARG['p']=0             OPT_VAL['p']=1
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 start_test
 
diff --git a/test-case/check-pause-release-suspend-resume.sh b/test-case/check-pause-release-suspend-resume.sh
@@ -115,8 +115,6 @@ esac
 
 logger_disabled || func_lib_start_log_collect
 
-setup_kernel_check_point
-
 dlogi "Entering audio stream expect script with: $cmd -D $pcm -r $rate -c $channel -f $fmt -vv -i $dummy_file -q"
 dlogi "Will enter suspend-resume cycle during paused period of audio stream process"
 
diff --git a/test-case/check-pause-resume.sh b/test-case/check-pause-resume.sh
@@ -46,7 +46,6 @@ OPT_NAME['S']='filter_string'   OPT_DESC['S']="run this case on specified pipeli
 OPT_HAS_ARG['S']=1             OPT_VAL['S']="id:any"
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 tplg=${OPT_VAL['t']}
 test_mode=${OPT_VAL['m']}
diff --git a/test-case/check-performance.sh b/test-case/check-performance.sh
@@ -88,7 +88,6 @@ main()
     start_test
     logger_disabled || func_lib_start_log_collect
 
-    setup_kernel_check_point
     func_lib_check_sudo
     func_pipeline_export "$tplg" "type:any"
 
diff --git a/test-case/check-playback.sh b/test-case/check-playback.sh
@@ -67,7 +67,6 @@ else
     dlogi "using $file as playback source"
 fi
 
-setup_kernel_check_point
 func_lib_check_sudo
 func_pipeline_export "$tplg" "type:playback & ${OPT_VAL['S']}"
 
diff --git a/test-case/check-runtime-pm-status.sh b/test-case/check-runtime-pm-status.sh
@@ -50,7 +50,6 @@ func_check_dsp_status()
 }
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 tplg=${OPT_VAL['t']}
 loop_count=${OPT_VAL['l']}
diff --git a/test-case/check-selector-play.sh b/test-case/check-selector-play.sh
@@ -128,7 +128,6 @@ main()
 
     logger_disabled || func_lib_start_log_collect
 
-    setup_kernel_check_point
     func_lib_check_sudo
     func_pipeline_export "$tplg" "type:any"
 
diff --git a/test-case/check-signal-stop-start.sh b/test-case/check-signal-stop-start.sh
@@ -60,8 +60,6 @@ case $test_mode in
     ;;
 esac
 
-setup_kernel_check_point
-
 func_stop_start_pipeline()
 {
     local i=1
diff --git a/test-case/check-smart-amplifier.sh b/test-case/check-smart-amplifier.sh
@@ -60,7 +60,6 @@ start_test
 logger_disabled || func_lib_start_log_collect
 
 func_pipeline_export "$tplg" "smart_amp:any"
-setup_kernel_check_point
 
 [ "$PIPELINE_COUNT" == "2" ] || die "Only detect $PIPELINE_COUNT pipeline(s) from topology, but two are needed"
 
diff --git a/test-case/check-src-play.sh b/test-case/check-src-play.sh
@@ -113,7 +113,6 @@ main()
     
     logger_disabled || func_lib_start_log_collect
 
-    setup_kernel_check_point
     func_lib_check_sudo
     func_pipeline_export "$tplg" "type:any"
 
diff --git a/test-case/check-src-rec.sh b/test-case/check-src-rec.sh
@@ -106,7 +106,6 @@ main()
     
     logger_disabled || func_lib_start_log_collect
 
-    setup_kernel_check_point
     func_lib_check_sudo
     func_pipeline_export "$tplg" "type:any"
 
diff --git a/test-case/check-suspend-resume-with-audio.sh b/test-case/check-suspend-resume-with-audio.sh
@@ -57,7 +57,6 @@ OPT_NAME['P']='pipelines'    OPT_DESC['P']="run test case on specified pipelines
 OPT_HAS_ARG['P']=1           OPT_VAL['P']="id:any"
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 func_lib_check_sudo
 
 tplg=${OPT_VAL['t']}
diff --git a/test-case/check-userspace-cardinfo.sh b/test-case/check-userspace-cardinfo.sh
@@ -20,7 +20,6 @@ set -e
 source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 start_test
 
diff --git a/test-case/check-userspace-paplay.sh b/test-case/check-userspace-paplay.sh
@@ -42,7 +42,6 @@ OPT_NAME['C']='channels'   OPT_DESC['C']='channels'
 OPT_HAS_ARG['C']=1         OPT_VAL['C']=2
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 start_test
 
diff --git a/test-case/check-userspace-parecord.sh b/test-case/check-userspace-parecord.sh
@@ -42,7 +42,6 @@ OPT_NAME['C']='channels'   OPT_DESC['C']='channels'
 OPT_HAS_ARG['C']=1         OPT_VAL['C']=2
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 round_cnt=${OPT_VAL['r']}
 duration=${OPT_VAL['d']}
diff --git a/test-case/check-volume-levels.sh b/test-case/check-volume-levels.sh
@@ -35,7 +35,6 @@ OPT_NAME['t']='tplg'     OPT_DESC['t']='tplg file, default value is env TPLG: $'
 OPT_HAS_ARG['t']=1         OPT_VAL['t']="$TPLG"
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 tplg=${OPT_VAL['t']}
 
diff --git a/test-case/check-xrun-injection.sh b/test-case/check-xrun-injection.sh
@@ -45,7 +45,6 @@ interval=${OPT_VAL['i']}
 start_test
 logger_disabled || func_lib_start_log_collect
 
-setup_kernel_check_point
 func_lib_check_sudo
 
 case $test_mode in
diff --git a/test-case/latency-metrics.sh b/test-case/latency-metrics.sh
@@ -273,8 +273,6 @@ main()
   pkill jackd || true
   check_latency_options
 
-  setup_kernel_check_point
-
   start_test
 
   logger_disabled || func_lib_start_log_collect
diff --git a/test-case/simultaneous-playback-capture.sh b/test-case/simultaneous-playback-capture.sh
@@ -34,7 +34,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
 
 tplg=${OPT_VAL['t']}
 wait_time=${OPT_VAL['w']}
diff --git a/test-case/test-jack-detection-dsp-d3.sh b/test-case/test-jack-detection-dsp-d3.sh
@@ -163,8 +163,6 @@ main()
 {
     func_pipeline_export "$tplg" "type:playback"
 
-    setup_kernel_check_point
-
     start_test
 
     dlogi "Checking usbrelay availability..."
diff --git a/test-case/test-jack-detection-playback-capture.sh b/test-case/test-jack-detection-playback-capture.sh
@@ -171,8 +171,6 @@ main()
 {
     func_pipeline_export "$tplg" "type:playback"
 
-    setup_kernel_check_point
-
     start_test
 
     dlogi "Checking usbrelay availability..."
diff --git a/test-case/test-mic-privacy.sh b/test-case/test-mic-privacy.sh
@@ -148,8 +148,6 @@ show_control_state()
 
 main()
 {
-    setup_kernel_check_point
-
     start_test
 
     dlogi "Checking usbrelay availability..."
diff --git a/test-case/test-speaker.sh b/test-case/test-speaker.sh
@@ -36,7 +36,7 @@ logger_disabled || func_lib_start_log_collect
 
 func_pipeline_export "$tplg" "type:playback"
 tcnt=${OPT_VAL['l']}
-setup_kernel_check_point
+
 for idx in $(seq 0 $((PIPELINE_COUNT - 1)))
 do
     channel=$(func_pipeline_parse_value "$idx" channel)
diff --git a/test-case/verify-bootsequence.sh b/test-case/verify-bootsequence.sh
@@ -30,7 +30,6 @@ ALSALIB_VER=1.2.2-44
 ALSAUCM_VER=1.2.3-15
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 start_test
 
diff --git a/test-case/verify-firmware-presence.sh b/test-case/verify-firmware-presence.sh
@@ -20,7 +20,6 @@ set -e
 source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 start_test
 
diff --git a/test-case/verify-kernel-module-load-probe.sh b/test-case/verify-kernel-module-load-probe.sh
@@ -18,8 +18,6 @@ source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
 
 func_opt_parse_option "$@"
 
-setup_kernel_check_point
-
 start_test
 
 dlogi "Checking if sof relative modules loaded"
diff --git a/test-case/verify-pcm-list.sh b/test-case/verify-pcm-list.sh
@@ -31,8 +31,6 @@ start_test
 tplg_path=$(func_lib_get_tplg_path "$tplg") ||
        	die "No available topology for this test case"
 
-setup_kernel_check_point
-
 tplg_str=$(sof-tplgreader.py "$tplg_path" -d id pcm type -o)
 pcm_str=$(sof-dump-status.py -i "${SOFCARD:-0}")
 
diff --git a/test-case/verify-tplg-binary.sh b/test-case/verify-tplg-binary.sh
@@ -23,7 +23,6 @@ OPT_NAME['t']='tplg'     OPT_DESC['t']="tplg file, default value is env TPLG: $T
 OPT_HAS_ARG['t']=1         OPT_VAL['t']="$TPLG"
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 tplg=${OPT_VAL['t']}
 
 start_test
diff --git a/test-case/verify-ucm-config.sh b/test-case/verify-ucm-config.sh
@@ -25,7 +25,6 @@
 source $(dirname ${BASH_SOURCE[0]})/../case-lib/lib.sh
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 
 start_test
 
diff --git a/test-case/volume-basic-test.sh b/test-case/volume-basic-test.sh
@@ -33,7 +33,6 @@ OPT_HAS_ARG['s']=0             OPT_VAL['s']=1
 set -e
 
 func_opt_parse_option "$@"
-setup_kernel_check_point
 tplg=${OPT_VAL['t']}
 maxloop=${OPT_VAL['l']}
 

Original file line number	Diff line number	Diff line change
`@@ -325,8 +325,6 @@ main()`
`325`	`325`	`{`
`326`	`326`	`init_globals`
`327`	`327`
`328`		`- setup_kernel_check_point`
`329`		`-`
`330`	`328`	`start_test`
`331`	`329`
`332`	`330`	`check_alsa_conformance_suite`