From 4aa909eb8fb499097a9fa90b75bc04e9b71f64e5 Mon Sep 17 00:00:00 2001 From: Julien Thierry Date: Tue, 8 Oct 2019 08:43:06 +0100 Subject: [PATCH] test/integration: Skip disabled tests in multiple.test Tests intentionaly disabled should be skipped by multiple.test Signed-off-by: Julien Thierry --- test/integration/common/multiple.template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integration/common/multiple.template b/test/integration/common/multiple.template index 003f9d9..678279c 100755 --- a/test/integration/common/multiple.template +++ b/test/integration/common/multiple.template @@ -5,6 +5,8 @@ KPATCH="sudo $ROOTDIR/kpatch/kpatch" MODULE_PREFIX="test-" MODULE_POSTFIX=".ko" TEST_POSTFIX="-LOADED.test" +PATCH_POSTFIX=".patch" +DISABLED_POSTFIX="${PATCH_POSTFIX}.disabled" set -o errexit @@ -44,6 +46,10 @@ for file in "${SCRIPTDIR}"/*"${TEST_POSTFIX}"; do break fi done + if ! [ -e ${file/${TEST_POSTFIX}/${PATCH_POSTFIX}} ] && \ + [ -e ${file/${TEST_POSTFIX}/${DISABLED_POSTFIX}} ]; then + skip=1 + fi if [ ${skip} -eq 0 ]; then modules+=(${MODULE_PREFIX}${name%${TEST_POSTFIX}}${MODULE_POSTFIX}) fi