Skip to content

checkpoints: do not use SOF_TEST_INTERVAL in test _iterations_ #870

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
Mar 1, 2022
Merged

checkpoints: do not use SOF_TEST_INTERVAL in test _iterations_ #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdbbc9c
sof-kernel-log-check: stop silently ignoring bad timestamp input
marc-hb Mar 1, 2022
5b385d5
checkpoints: do not use SOF_TEST_INTERVAL in test _iterations_
marc-hb Mar 1, 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
2 changes: 2 additions & 0 deletions case-lib/hijack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ function func_exit_handler()
fi

if [[ "$KERNEL_CHECKPOINT" =~ ^[0-9]{10} ]]; then
# Do not collect the entire duration of the test but only the
# last iteration.
journalctl_cmd --since=@"$KERNEL_CHECKPOINT" > "$LOG_ROOT/dmesg.txt"
elif [[ "$KERNEL_CHECKPOINT" == "disabled" ]]; then
journalctl_cmd > "$LOG_ROOT/dmesg.txt"
Expand Down
11 changes: 10 additions & 1 deletion case-lib/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,14 @@ setup_kernel_check_point()
# appear in the next one, see comments in config.sh. Add 3 extra
# second to account for our own, sof-test delays after PASS/FAIL
# decision: time spent collecting logs etc.
KERNEL_CHECKPOINT=$(($(date +%s) - SOF_TEST_INTERVAL - 3))
if [ -z "$KERNEL_CHECKPOINT" ]; then
KERNEL_CHECKPOINT=$(($(date +%s) - SOF_TEST_INTERVAL - 3))
else
# Not the first time we are called so this is a test
# _iteration_. Add just one extra second in case a test makes
# the mistake to call this function _after_ checking the logs.
KERNEL_CHECKPOINT=$(($(date +%s) - 1))
fi
}

# This function adds a fake error to dmesg (which is always saved by
Expand Down Expand Up @@ -425,6 +432,8 @@ journalctl_cmd()
--no-hostname "$@"
}

# Force the exit handler to collect all the logs since boot time instead
# of just the last test iteration.
disable_kernel_check_point()
{
KERNEL_CHECKPOINT="disabled"
Expand Down
9 changes: 7 additions & 2 deletions tools/sof-kernel-log-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@
# Append some garbage to an ignore pattern to turn it off. Much easier
# than deleting it.

begin_timestamp=${1:-0}
# Don't look at journalctl logs before this time in seconds since
# 1970. Defaults to zero which is a no-op because we always use -k or
# -b.
begin_timestamp=${1:-0000000000}

declare ignore_str

# pwd resolves relative paths
Expand Down Expand Up @@ -376,7 +380,7 @@ ignore_str="$ignore_str"'|iwlwifi [[:digit:].:]+: '
if [[ $begin_timestamp =~ ^[0-9]{10} ]]; then
cmd="journalctl_cmd --since=@$begin_timestamp"
else
cmd="journalctl_cmd"
die "Invalid begin_timestamp $1 argument: $begin_timestamp"
fi

declare -p cmd
Expand All @@ -388,6 +392,7 @@ else
fi

[[ -z "$err" ]] || {
type journalctl_cmd
echo "$(date -u '+%Y-%m-%d %T %Z')" "[ERROR]" "Caught kernel log error"
echo "===========================>>"
echo "$err"
Expand Down