Skip to content

check-sof-logger: change BEG>> to BEG:: to avoid HTML conflict #668

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

Merged
marc-hb merged 2 commits into from
Apr 28, 2021
Merged

check-sof-logger: change BEG>> to BEG:: to avoid HTML conflict #668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c31f270
check-sof-logger: relax TIMESTAMP.*CONTENT regex
marc-hb Apr 27, 2021
6a42ab5
check-sof-logger: change BEG>> to BEG:: to avoid HTML conflict
marc-hb Apr 27, 2021
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: 10 additions & 6 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,18 +56,22 @@ sudo pkill -9 "$(basename "$loggerBin")" 2> /dev/null

func_logger_exit()
{
local code=$1 type=${2:-data}
dlogi "Log $type BEG>>"
cat "$LOG_ROOT/logger.$type.log"
dlogi "<<END $type data"
local code=$1

for ftype in data error; do
printf '\n'
dlogi "Log $ftype BEG::"
cat "$LOG_ROOT/logger.$ftype.log"
dlogi "::END $ftype"
done
exit "$code"
}

# check if we get any sof-logger errors
logger_err=$(grep -i 'error' "$error_file")
if [[ $logger_err ]]; then
dloge "No available log to export due to sof-logger errors."
func_logger_exit 1 'error'
func_logger_exit 1
fi

# '\.c\:[1-9]' to filter like '.c:6' this type keyword like:
Expand All @@ -76,7 +80,7 @@ fw_log_err=$(grep -i 'error' "$data_file" | grep -v '\.c\:[1-9]')

# '[[:blank:]]TIMESTAMP.*CONTENT$' to filter the log header:
# TIMESTAMP DELTA C# COMPONENT LOCATION CONTENT
if [[ ! $(sed -n '/[[:blank:]]TIMESTAMP.*CONTENT$/p' "${data_file}") ]]; then
if [[ ! $(sed -n '/TIMESTAMP.*CONTENT/p' "${data_file}") ]]; then
dloge "Log header not found in ${data_file}"
func_logger_exit 1
# we catch error from fw log
Expand Down