RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-03 02:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

testing: add a PATCHES_LIST to kpatch-test

Browse Source 
Instead of building *.patch, allow the user to specify patch files on
the command line.  For example:

  kpatch-test --quick centos-7/cmdline-string.patch centos-7/data-new.patch

Update the top-level Makefile as well, so it can be similarly invoked:

  PATCHES="centos-7/cmdline-string.patch centos-7/data-new.patch" make quick

If no patches are specified on the kpatch-test command line, then fall
back to the previous behavior of *.patch.

NOTE: If patches *are* specified, then only the .test files
corresponding to those patches will be executed.  Provided patch paths
will also override any --directory value.
This commit is contained in:
Joe Lawrence 2016-12-07 15:05:41 -05:00
parent 5db4e232ee
commit 6ee3c0f8fa
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/Makefile
View File

@ -10,13 +10,13 @@ local: slow
remote: remote_slow
slow: clean
./kpatch-test -d $(PATCH_DIR)
./kpatch-test -d $(PATCH_DIR) $(PATCHES)
quick: clean
./kpatch-test -d $(PATCH_DIR) --quick
./kpatch-test -d $(PATCH_DIR) --quick $(PATCHES)
cached:
./kpatch-test -d $(PATCH_DIR) --cached
./kpatch-test -d $(PATCH_DIR) --cached $(PATCHES)
clean:
rm -f *.ko *.log COMBINED.patch

53
test/integration/kpatch-test
View File

@ -42,7 +42,6 @@
SCRIPTDIR="$(readlink -f $(dirname $(type -p $0)))"
ROOTDIR="$(readlink -f $SCRIPTDIR/../..)"
PATCHDIR=$PWD
# TODO: option to use system-installed binaries instead
KPATCH="sudo $ROOTDIR/kpatch/kpatch"
RMMOD="sudo rmmod"
@ -52,8 +51,13 @@ ERROR=0
LOG=test.log
rm -f $LOG
PATCHDIR="${PATCHDIR:-$PWD}"
declare -a PATCH_LIST
declare -a TEST_LIST
usage() {
echo "usage: $0 [options]" >&2
echo "usage: $0 [options] [patch1 ... patchN]" >&2
echo " patchN Pathnames of patches to test" >&2
echo " -h, --help Show this help message" >&2
echo " -c, --cached Don't rebuild patch modules" >&2
echo " -d, --directory Patch directory" >&2
@ -80,10 +84,25 @@ while [[ $# -gt 0 ]]; do
-q|--quick)
QUICK=1
;;
*)
[[ "$1" = "--" ]] && shift && continue
PATCH_LIST+=("$1")
;;
esac
shift
done
if [[ ${#PATCH_LIST[@]} = 0 ]]; then
PATCH_LIST=($PATCHDIR/*.patch)
TEST_LIST=($PATCHDIR/*.test)
else
for file in "${PATCH_LIST[@]}"; do
prefix=${file%%.patch}
[[ -e "$prefix-FAIL.test" ]] && TEST_LIST+=("$prefix-FAIL.test")
[[ -e "$prefix-LOADED.test" ]] && TEST_LIST+=("$prefix-LOADED.test")
[[ -e "$prefix-SLOW.test" ]] && TEST_LIST+=("$prefix-SLOW.test")
done
fi
error() {
echo "ERROR: $@" |tee -a $LOG >&2
@ -206,14 +225,22 @@ build_combined_module() {
return
fi
declare -a COMBINED_LIST
for file in "${PATCH_LIST[@]}"; do
[[ $file =~ -FAIL ]] && log "combine: skipping $file" && continue
[[ $file =~ -SLOW ]] && log "combine: skipping $file" && continue
COMBINED_LIST+=($file)
done
if [[ ${#COMBINED_LIST[@]} -le 1 ]]; then
log "skipping build: combined (only ${#PATCH_LIST[@]} patch(es))"
return
fi
rm -f COMBINED.patch TMP.patch
first=1
for file in $PATCHDIR/*.patch; do
for file in "${COMBINED_LIST[@]}"; do
prefix=${file%%.patch}
[[ $prefix =~ -FAIL ]] && continue
[[ $prefix =~ -SLOW ]] && continue
log "combine: $prefix"
if [[ $first -eq 1 ]]; then
@ -243,7 +270,7 @@ run_combined_test() {
unload_all
for testprog in $PATCHDIR/*.test; do
for testprog in "${TEST_LIST[@]}"; do
[[ $testprog != *-LOADED.test ]] && continue
if $testprog >> $LOG 2>&1; then
error "combined: $testprog succeeded before kpatch load"
@ -256,7 +283,7 @@ run_combined_test() {
return
fi
for testprog in $PATCHDIR/*.test; do
for testprog in "${TEST_LIST[@]}"; do
[[ $testprog != *-LOADED.test ]] && continue
if ! $testprog >> $LOG 2>&1; then
error "combined: $testprog failed after kpatch load"
@ -268,7 +295,7 @@ run_combined_test() {
return
fi
for testprog in $PATCHDIR/*.test; do
for testprog in "${TEST_LIST[@]}"; do
[[ $testprog != *-LOADED.test ]] && continue
if $testprog >> $LOG 2>&1; then
error "combined: $testprog succeeded after kpatch unload"
@ -282,7 +309,7 @@ echo "clearing printk buffer"
sudo dmesg -C
if [[ $QUICK != 1 ]]; then
for file in $PATCHDIR/*.patch; do
for file in "${PATCH_LIST[@]}"; do
build_module $file
done
fi
@ -292,7 +319,7 @@ build_combined_module
unload_all
if [[ $QUICK != 1 ]]; then
for file in $PATCHDIR/*.patch; do
for file in "${PATCH_LIST[@]}"; do
run_load_test $file
done
fi
@ -300,9 +327,9 @@ fi
run_combined_test
if [[ $QUICK != 1 ]]; then
for file in $PATCHDIR/*.test; do
for testprog in "${TEST_LIST[@]}"; do
unload_all
run_custom_test $file
run_custom_test $testprog
done
fi