From fd85aedcc81e9deac75fd253005234efed0e5aee Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 18 Jul 2023 16:03:37 +0300 Subject: [PATCH] check-sof-logger: Switch to use is_firmware_file_zephyr The is_zephyr check looks at the number of 'zephyr' strings in the LDC file while the is_firmware_file_zephyr is doing the same on the actual firmware file. It has been observed that the is_zephyr function can get the detection wrong and reports false for a zephyr firmware. Note also that virtually only the check-sof-logger is using the is_zephyr call, all other test cases use the is_firmware_file_zephyr call. Signed-off-by: Peter Ujfalusi --- test-case/check-sof-logger.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test-case/check-sof-logger.sh b/test-case/check-sof-logger.sh index aacad43d..69c3bf14 100755 --- a/test-case/check-sof-logger.sh +++ b/test-case/check-sof-logger.sh @@ -76,7 +76,7 @@ run_loggers() # the same time, so $data_file will hopefully not be long. local collect_secs=2 - if is_zephyr; then + if is_firmware_file_zephyr; then # Collect logs from Zephyr logging backends if is_ipc4 ; then @@ -136,7 +136,7 @@ run_loggers() } fi - if is_zephyr; then + if is_firmware_file_zephyr; then # Zephyr logging backends if is_ipc4 ; then @@ -281,12 +281,12 @@ main() test -e "$tracef" || die "$tracef" not found local tool_banner boot_banner - if is_ipc4 && is_zephyr && [ "$f" = 'etrace' ]; then + if is_ipc4 && is_firmware_file_zephyr && [ "$f" = 'etrace' ]; then # mtrace # No specific tool banner, just check some logs are visible. tool_banner=' .*<.*>' boot_banner='FW ABI.*tag.*zephyr' - elif is_zephyr && [ "$f" = 'etrace' ]; then + elif is_firmware_file_zephyr && [ "$f" = 'etrace' ]; then # cavstool tool_banner=':cavs-fw:' boot_banner='FW ABI.*tag.*zephyr'