mirror of https://github.com/dynup/kpatch
kpatch-test: make it easier to use custom kpatch and kpatch-build commands
The commands used to build the livepatches and to load or unload them are currently hard-coded in kpatch-test. This patch adds 2 options to kpatch-test to make it easier to use custom kpatch and kpatch-build commands: * --system-kpatch-tools - if set, 'sudo kpatch' will be used to load/unload the patches; 'kpatch-build' - to build them. To use custom tools here, the user can adjust $PATH. If the option is not set, kpatch-test will assume it is in kpatch source tree, same as before this commit, and will use the tools from there. * --kpatch-build-opts="..." - additional options to pass to kpatch-build. Example: ./kpatch-test \ --system-kpatch-tools \ --kpatch-build-opts="-s ./linux-src -c ./config -v ./vmlinux" \ -d my_kpatch_tests/test/integration/v01 In this case, kpatch and kpatch-build installed in the system will be used, and kpatch-build will look for the kernel source tree, configuration file and vmlinux binary in the current directory. Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
This commit is contained in:
parent
01b8d34c4b
commit
78f2c063ae
|
@ -43,7 +43,6 @@ shopt -s nullglob
|
||||||
# shellcheck disable=SC2046
|
# shellcheck disable=SC2046
|
||||||
SCRIPTDIR=$(readlink -f $(dirname $(type -p "$0")))
|
SCRIPTDIR=$(readlink -f $(dirname $(type -p "$0")))
|
||||||
ROOTDIR=$(readlink -f "$SCRIPTDIR/../..")
|
ROOTDIR=$(readlink -f "$SCRIPTDIR/../..")
|
||||||
# TODO: option to use system-installed binaries instead
|
|
||||||
KPATCH="sudo $ROOTDIR/kpatch/kpatch"
|
KPATCH="sudo $ROOTDIR/kpatch/kpatch"
|
||||||
unset CCACHE_HASHDIR
|
unset CCACHE_HASHDIR
|
||||||
KPATCHBUILD="$ROOTDIR"/kpatch-build/kpatch-build
|
KPATCHBUILD="$ROOTDIR"/kpatch-build/kpatch-build
|
||||||
|
@ -64,9 +63,11 @@ usage() {
|
||||||
echo " -c, --cached Don't rebuild patch modules" >&2
|
echo " -c, --cached Don't rebuild patch modules" >&2
|
||||||
echo " -d, --directory Patch directory" >&2
|
echo " -d, --directory Patch directory" >&2
|
||||||
echo " -q, --quick Test combined patch and -FAIL patches only" >&2
|
echo " -q, --quick Test combined patch and -FAIL patches only" >&2
|
||||||
|
echo " --system-kpatch-tools Use kpatch tools installed in the system" >&2
|
||||||
|
echo " --kpatch-build-opts Additional options to pass to kpatch-build" >&2
|
||||||
}
|
}
|
||||||
|
|
||||||
options=$(getopt -o hcd:q -l "help,cached,directory,quick" -- "$@") || exit 1
|
options=$(getopt -o hcd:q -l "help,cached,directory,quick,system-kpatch-tools,kpatch-build-opts:" -- "$@") || exit 1
|
||||||
|
|
||||||
eval set -- "$options"
|
eval set -- "$options"
|
||||||
|
|
||||||
|
@ -86,6 +87,14 @@ while [[ $# -gt 0 ]]; do
|
||||||
-q|--quick)
|
-q|--quick)
|
||||||
QUICK=1
|
QUICK=1
|
||||||
;;
|
;;
|
||||||
|
--system-kpatch-tools)
|
||||||
|
KPATCH="sudo kpatch"
|
||||||
|
KPATCHBUILD="kpatch-build"
|
||||||
|
;;
|
||||||
|
--kpatch-build-opts)
|
||||||
|
KPATCHBUILD_OPTS=$2
|
||||||
|
shift
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
[[ "$1" = "--" ]] && shift && continue
|
[[ "$1" = "--" ]] && shift && continue
|
||||||
PATCH_LIST+=("$1")
|
PATCH_LIST+=("$1")
|
||||||
|
@ -143,7 +152,10 @@ build_module() {
|
||||||
|
|
||||||
log "build: $prefix"
|
log "build: $prefix"
|
||||||
|
|
||||||
if ! $KPATCHBUILD -n "$modname" "$file" >> $LOG 2>&1; then
|
# shellcheck disable=SC2086
|
||||||
|
# KPATCHBUILD_OPTS may contain several space-separated options,
|
||||||
|
# it should remain without quotes.
|
||||||
|
if ! $KPATCHBUILD $KPATCHBUILD_OPTS -n "$modname" "$file" >> $LOG 2>&1; then
|
||||||
if [[ $shouldfail -eq 0 ]]; then
|
if [[ $shouldfail -eq 0 ]]; then
|
||||||
error "$prefix: build failed"
|
error "$prefix: build failed"
|
||||||
cp "$HOME/.kpatch/build.log" "$prefix.log"
|
cp "$HOME/.kpatch/build.log" "$prefix.log"
|
||||||
|
@ -231,7 +243,8 @@ build_combined_module() {
|
||||||
|
|
||||||
log "build: combined module"
|
log "build: combined module"
|
||||||
|
|
||||||
if ! $KPATCHBUILD -n test-COMBINED "${COMBINED_LIST[@]}" >> $LOG 2>&1; then
|
# shellcheck disable=SC2086
|
||||||
|
if ! $KPATCHBUILD $KPATCHBUILD_OPTS -n test-COMBINED "${COMBINED_LIST[@]}" >> $LOG 2>&1; then
|
||||||
error "combined build failed"
|
error "combined build failed"
|
||||||
cp "$HOME/.kpatch/build.log" combined.log
|
cp "$HOME/.kpatch/build.log" combined.log
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue