Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check-sof-logger: fix FAIL message to point at the correct file #798

Merged
merged 1 commit into from
Nov 2, 2021
Merged

check-sof-logger: fix FAIL message to point at the correct file #798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test-case/check-sof-logger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ ldcFile=$(find_ldc_file) || die ".ldc file not found!"

dlogi "Found file: $(md5sum "$ldcFile"|awk '{print $2, $1;}')"

# These filenames are kept for backward-compatibility
# DMA trace
data_file=$LOG_ROOT/logger.data.txt
# stderr
error_file=$LOG_ROOT/logger.error.txt

# etrace shared memory mailbox, newer feature.
etrace_file=$LOG_ROOT/logger.etrace.txt
etrace_stderr_file=$LOG_ROOT/logger.etrace_stderr.txt
Expand All @@ -70,6 +64,12 @@ func_lib_check_sudo

run_loggers()
{
# These filenames are kept for backward-compatibility
# DMA trace
local data_file=$LOG_ROOT/logger.data.txt
# stderr
local error_file=$LOG_ROOT/logger.error.txt

local etrace_exit

# This test is not really supposed to run while the DSP is busy at
Expand Down Expand Up @@ -181,7 +181,7 @@ main()
test -e "$tracef" || die "$tracef" not found
# Other columns are optional
head -n 1 "$tracef" | grep -q 'COMPONENT.*CONTENT' ||
print_logs_exit 1 "Log header not found in ${data_file}"
print_logs_exit 1 "Log header not found in ${tracef}"

# See initial message SOF PR #3281 / SOF commit 67a0a69
grep -q 'dma-trace.c.*FW ABI.*tag.*hash' "$tracef" || {
Expand All @@ -204,7 +204,7 @@ main()
fi
fi

print_logs_exit 1 "Initial FW ABI banner not found in ${data_file}"
print_logs_exit 1 "Initial FW ABI banner not found in ${tracef}"
}
done

Expand Down