Skip to content

sof-kernel-log-check: drop $journalctlflag duplicating journalctl_cmd() #545

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 1 commit into from
Dec 4, 2020
Merged

sof-kernel-log-check: drop $journalctlflag duplicating journalctl_cmd() #545

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
15 changes: 9 additions & 6 deletions tools/sof-kernel-log-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,15 @@ begin_timestamp=${1:-0}
declare ignore_str

# pwd resolves relative paths
my_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
platform=$("$my_dir"/sof-dump-status.py -p)
test_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)
platform=$("$test_dir"/tools/sof-dump-status.py -p)

# shellcheck source=case-lib/lib.sh
source "$test_dir"/case-lib/lib.sh

# TODO explain
# The first string cannot start by |

# TODO explain why we ignore this one and where
ignore_str='error: debugfs write failed to idle -16'

# CML Helios known issue related with xhci_hcd
Expand Down Expand Up @@ -312,11 +316,10 @@ ignore_str="$ignore_str"'|elan_i2c i2c-ELAN0000:.*: invalid report id data'
ignore_str="$ignore_str"'|rt700 sdw:.:.*:700:.: Bus clash detected'

# confirm begin_timestamp is in UNIX timestamp format, otherwise search full log
journalctlflag="-k -q --no-pager --utc --output=short-monotonic --no-hostname"
if [[ $begin_timestamp =~ ^[0-9]{10} ]]; then
cmd="journalctl $journalctlflag --since=@$begin_timestamp"
cmd="journalctl_cmd --since=@$begin_timestamp"
else
cmd="journalctl $journalctlflag"
cmd="journalctl_cmd"
fi

declare -p cmd
Copy link
Contributor

@xiulipan xiulipan Dec 3, 2020

Choose a reason for hiding this comment

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

maybe it is also time to remove the debug log here.

Copy link
Collaborator Author

@marc-hb marc-hb Dec 3, 2020

Choose a reason for hiding this comment

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

#529 is less than one week old so I would rather wait a bit longer.

Expand Down