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

lib.sh: fix recent check_error_in_file() . Exclude BSW #946

Merged
merged 2 commits into from
Aug 5, 2022
Merged

lib.sh: fix recent check_error_in_file() . Exclude BSW #946

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3329e2d
check-sof-logger: don't search for firmware ERRORS on bsw either
marc-hb Jul 29, 2022
f22a5dd
lib.sh: fix recent check_error_in_file()
marc-hb Jul 29, 2022
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
10 changes: 6 additions & 4 deletions case-lib/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,14 +356,12 @@ func_lib_start_log_collect()
sudo "${loggerCmd[@]}" > "$logfile" &
}

# -B 2 shows the header line when the first etrace message is an ERROR
# -A 1 shows whether the ERROR is last or not.
check_error_in_file()
{
local platf; platf=$(sof-dump-status.py -p)

case "$platf" in
byt|bdw)
byt|bdw|bsw)
# Maybe downgrading this to WARN would be enough, see #799
# src/trace/dma-trace.c:654 ERROR dtrace_add_event(): number of dropped logs = 8
dlogw 'not looking for ERROR on BYT/BDW because of known DMA issues #4333 and others'
Expand All @@ -375,7 +373,11 @@ check_error_in_file()
dloge "file NOT FOUND: '$1'"
return 1
}
if grep -B 2 -A 1 -E 'ERRO?R?' "$1"; then
# -B 2 shows the header line when the first etrace message is an ERROR
# -A 1 shows whether the ERROR is last or not.
if (set -x
grep -B 2 -A 1 -i -w -e 'ERR' -e 'ERROR' "$1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it weird that I find "-B2 -A1" more legible?

); then
return 1
fi
}
Expand Down