Skip to content

check-kmod-load-unload: use TOPDIR, don't rely on PATH #808

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
Dec 2, 2021
Merged

check-kmod-load-unload: use TOPDIR, don't rely on PATH #808

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
2510895
check-kmod-load-unload: add new TOPDIR constant
marc-hb Nov 22, 2021
09442f4
check-kmod-load-unload: use TOPDIR, don't rely on PATH
marc-hb Nov 22, 2021
3037e38
kmod/sof_insert: add comment explaining how pam_unix slows sudo
marc-hb Nov 23, 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
9 changes: 6 additions & 3 deletions test-case/check-kmod-load-unload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ set -e
## check kernel log and find no errors
##

TOPDIR="$(dirname "${BASH_SOURCE[0]}")"/..
TOPDIR=$(cd "$TOPDIR" && pwd)

# shellcheck source=case-lib/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")"/../case-lib/lib.sh
source "${TOPDIR}"/case-lib/lib.sh

OPT_NAME['l']='loop_cnt'
OPT_DESC['l']='remove / insert module loop count -- per device'
Expand Down Expand Up @@ -71,7 +74,7 @@ do
done

dlogi "run kmod/sof-kmod-remove.sh"
sudo sof_remove.sh || die "remove modules error"
"$TOPDIR"/tools/kmod/sof_remove.sh || die "remove modules error"

## - 1a: check for errors after removal
dlogi "checking for general errors after kmod unload with sof-kernel-log-check tool"
Expand All @@ -80,7 +83,7 @@ do

setup_kernel_check_point
dlogi "run kmod/sof_insert.sh"
sudo sof_insert.sh || die "insert modules error"
"$TOPDIR"/tools/kmod/sof_insert.sh || die "insert modules error"

## - 2a: check for errors after insertion
dlogi "checking for general errors after kmod insert with sof-kernel-log-check tool"
Expand Down
3 changes: 3 additions & 0 deletions tools/kmod/sof_insert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ insert_module() {
printf 'MODPROBE\t%s\t\t' "$MODULE"
printf '%s ' "$@"
printf '\n'
# If sudo is slow, it's probably because the 'account' service
# of the pam_unix.so module. Its version 1.5.1-7.fc34 tries to
# close() all file descriptors from 65535 to 0.
sudo modprobe "$MODULE" "$@"
else
printf 'SKIP \t%s \t(not in tree)\n' "$MODULE"
Expand Down