diff --git a/test/cases/020_kernel/000_config_4.4.x/test.sh b/test/cases/020_kernel/000_config_4.4.x/test.sh index f05fc86d5..2ecd67ed8 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.sh +++ b/test/cases/020_kernel/000_config_4.4.x/test.sh @@ -10,13 +10,13 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; + find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; || true } trap clean_up EXIT # Test code goes here moby build -output kernel+initrd test-kernel-config.yml -RESULT="$(linuxkit run qemu -kernel test-kernel-config)" +RESULT="$(linuxkit run test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.sh b/test/cases/020_kernel/001_config_4.9.x/test.sh index 1c047cae1..2ecd67ed8 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.sh +++ b/test/cases/020_kernel/001_config_4.9.x/test.sh @@ -10,13 +10,13 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; + find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; || true } trap clean_up EXIT # Test code goes here moby build -output kernel+initrd test-kernel-config.yml -RESULT="$(linuxkit run qemu test-kernel-config)" +RESULT="$(linuxkit run test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/003_config_4.11.x/test.sh b/test/cases/020_kernel/003_config_4.11.x/test.sh index 1c047cae1..2ecd67ed8 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test.sh +++ b/test/cases/020_kernel/003_config_4.11.x/test.sh @@ -10,13 +10,13 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" clean_up() { - find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; + find . -iname "test-kernel-config*" -not -iname "*.yml" -exec rm -rf {} \; || true } trap clean_up EXIT # Test code goes here moby build -output kernel+initrd test-kernel-config.yml -RESULT="$(linuxkit run qemu test-kernel-config)" +RESULT="$(linuxkit run test-kernel-config)" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh index 50f6079ca..9a08df964 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh @@ -13,7 +13,7 @@ IMAGE_NAME="kmod-test" clean_up() { docker rmi ${IMAGE_NAME} || true - find . -iname "kmod*" -not -iname "*.yml" -exec rm -rf {} \; + find . -iname "kmod*" -not -iname "*.yml" -exec rm -rf {} \; || true } trap clean_up EXIT @@ -21,7 +21,10 @@ trap clean_up EXIT docker pull linuxkit/kernel:4.9.x # Build a package docker build -t ${IMAGE_NAME} . -# Build a LinuxKit image with kernel module (and test script) + +# Build and run a LinuxKit image with kernel module (and test script) moby build -output kernel+initrd kmod.yml -# Run it -linuxkit run qemu kmod | grep -q "Hello LinuxKit" +RESULT="$(linuxkit run kmod)" +echo "${RESULT}" | grep -q "Hello LinuxKit" + +exit 0