Skip to content

hijack.sh: don't return error when test case is already skip #802

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

Open
fredoh9 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

hijack.sh: don't return error when test case is already skip #802

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
3 changes: 2 additions & 1 deletion case-lib/hijack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ function func_exit_handler()

local nlines; nlines=$(wc -l < "$logfile") # line count only
# The first line is the sof-logger header
if [ "$nlines" -le 1 ]; then
# Don't override exit_status if already SKIPped test case
if ([ "$nlines" -le 1 ] && [ $exit_status -ne 2 ]); then
Copy link
Member

@plbossart plbossart Nov 5, 2021

Choose a reason for hiding this comment

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

I really don't get the flow in this file. If an error was already identified (exist_status=1), then what is the point of trying to check additional things?

In this case, if the exit_status is already not zero, why add something related to an empty logger trace?

Copy link
Contributor Author

@fredoh9 fredoh9 Nov 5, 2021

Choose a reason for hiding this comment

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

agree, flow is not clean here. exit_status is overwritten under many conditions in this hijack function. Original value of exit_status is easily forgotten.

dloge "Empty logger trace"
exit_status=1
fi
Expand Down