Skip to content

SKIP check-sof-logger if is_zephyr #724

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 3 commits into from
Jul 1, 2021
Merged

SKIP check-sof-logger if is_zephyr #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
635ee81
lib.sh: simplify is_zephyr()
marc-hb Jun 30, 2021
2b20609
Add new skip_test() function and use it
marc-hb Jun 30, 2021
f72e297
check-sof-logger: SKIP test if is_zephyr()
marc-hb Jun 30, 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
14 changes: 8 additions & 6 deletions case-lib/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,13 @@ die()
exit 1
}

skip_test()
{
dlogi "$@"
# See func_exit_handler()
exit 2
}

is_sof_used()
{
grep -q "sof" /proc/asound/cards;
Expand Down Expand Up @@ -357,12 +364,7 @@ is_zephyr()

logger_disabled()
{
# disable logger when firmware type is zephyr or -s is set to 0
if is_zephyr || [[ ${OPT_VAL['s']} -ne 1 ]]; then
return 0
else
return 1
fi
[[ ${OPT_VAL['s']} -eq 0 ]] || is_zephyr
}

print_module_params()
Expand Down
2 changes: 1 addition & 1 deletion test-case/check-runtime-pm-double-active.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ loop_count=${OPT_VAL['l']}
[[ -z $tplg ]] && dloge "Miss tplg file to run" && exit 2

[[ $(sof-dump-status.py --dsp_status 0) == "unsupported" ]] &&
dlogi "platform doesn't support runtime pm, skip test case" && exit 2
skip_test "platform doesn't support runtime pm, skip test case"

declare -A APP_LST DEV_LST
APP_LST['playback']='aplay'
Expand Down
2 changes: 1 addition & 1 deletion test-case/check-runtime-pm-status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ loop_count=${OPT_VAL['l']}
[[ -z $tplg ]] && die "Miss tplg file to run"

[[ $(sof-dump-status.py --dsp_status 0) == "unsupported" ]] &&
dlogi "platform doesn't support runtime pm, skip test case" && exit 2
skip_test "platform doesn't support runtime pm, skip test case"

declare -A APP_LST DEV_LST
APP_LST['playback']='aplay'
Expand Down
5 changes: 5 additions & 0 deletions test-case/check-sof-logger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ reload_drivers()

main()
{
if is_zephyr; then
disable_kernel_check_point
skip_test "The SOF logger does not work with Zephyr yet, see issue #4420"
fi

reload_drivers

run_loggers ||
Expand Down
2 changes: 1 addition & 1 deletion test-case/check-xrun-injection.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ do
xrun_injection="/proc/asound/card0/$pcm/sub0/xrun_injection"

# check xrun injection file
[[ ! -e $xrun_injection ]] && dloge "XRUN DEBUG is not enabled in kernel, skip the test." && exit 2
[[ ! -e $xrun_injection ]] && skip_test "XRUN DEBUG is not enabled in kernel, skip the test."
dlogi "Testing: test xrun injection on PCM:$pcm,$pipeline_type. Interval time: $interval"
dlogc "$cmd -D$dev -r $rate -c $channel -f $fmt $dummy_file -q"
$cmd -D$dev -r $rate -c $channel -f $fmt $dummy_file -q &
Expand Down