Skip to content
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

Jump to bottom

HACK: SOF_LOGGING=none for CI testing #814

Closed
wants to merge 2 commits into from
Closed

HACK: SOF_LOGGING=none for CI testing #814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1de043b
lib.sh: disable logging with SOF_LOGGING=none env or missing .ldc
marc-hb Dec 1, 2021
851dc6f
HACK: SOF_LOGGING=none for CI testing
marc-hb Dec 1, 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
29 changes: 27 additions & 2 deletions case-lib/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ fake_kern_error()

}

# Prints the .ldc file found on stdout, errors on stderr.
find_ldc_file()
{
local ldcFile
Expand All @@ -87,6 +88,7 @@ find_ldc_file()
# and then on the standard location.
if [ -n "$SOFLDC" ]; then
ldcFile="$SOFLDC"
>&2 dlogi "SOFLDC=${SOFLDC} overriding default locations"
else
local platf; platf=$(sof-dump-status.py -p) || {
>&2 dloge "Failed to query platform with sof-dump-status.py"
Expand All @@ -98,7 +100,7 @@ find_ldc_file()
fi

[[ -e "$ldcFile" ]] || {
>&2 dloge "LDC file $ldcFile not found, check the SOFLDC environment variable or copy your sof-*.ldc to /etc/sof"
>&2 dlogi "LDC file $ldcFile not found"
return 1
}
printf '%s' "$ldcFile"
Expand Down Expand Up @@ -395,9 +397,32 @@ is_zephyr()
jq '.version.firmwareType' "$manifest" | grep "zephyr"
}

# CI test HACK - DO NOT MERGE
SOF_LOGGING=none

logger_disabled()
{
[[ ${OPT_VAL['s']} -eq 0 ]]
local ldcFile
# Some firmware/OS configurations do not support logging.
ldcFile=$(find_ldc_file) || {
dlogi '.ldc dictionary file not found, SOF logs collection disabled'
return 0 # 0 is 'true'
}

# Disable logging when available...
if [ ${OPT_VAL['s']} -eq 0 ]; then
return 0
fi

# ... across all tests at once.
# In the future we should support SOF_LOGGING=etrace (only), see
# sof-test#726
if [ "x$SOF_LOGGING" == 'xnone' ]; then
dlogi 'SOF logs collection globally disabled by SOF_LOGGING=none'
return 0
fi

return 1
}

print_module_params()
Expand Down