diff options
| -rwxr-xr-x | rc.testwrapper | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/bcache/bcache_device_remove_2.ktest | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/bcache/bcache_device_remove_3.ktest | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/rc.testwrapper b/rc.testwrapper index 623e31b..f362ce1 100755 --- a/rc.testwrapper +++ b/rc.testwrapper @@ -51,9 +51,20 @@ copy_to_host() ) } +check_taint() +{ + read taint < /proc/sys/kernel/tainted + + if [[ $taint != 0 ]]; then + echo "Failure because kernel tainted - check log for warnings" + echo "TEST FAILED" + fi +} + do_reboot() { copy_to_host + check_taint echo $((NR_REBOOTS + 1)) | dd of=/EXPECTED_REBOOT oflag=direct 2> /dev/null echo b > /proc/sysrq-trigger @@ -156,6 +167,7 @@ echo "Copying output to host" # success copy_to_host +check_taint if [ $ret = 0 ]; then echo "TEST SUCCESS" diff --git a/tests/bcache/bcache_device_remove_2.ktest b/tests/bcache/bcache_device_remove_2.ktest index 8937cac..40929b4 100755..100644 --- a/tests/bcache/bcache_device_remove_2.ktest +++ b/tests/bcache/bcache_device_remove_2.ktest @@ -2,7 +2,8 @@ require-lib bcache-test-libs.sh -config-cache 16M +# config-cache 16M 16M occasionally causes deadlock in larger runs +config-cache 64M config-tier 512M config-bucket-size 64k config-block-size 4k diff --git a/tests/bcache/bcache_device_remove_3.ktest b/tests/bcache/bcache_device_remove_3.ktest index b6ee85e..f323f51 100755..100644 --- a/tests/bcache/bcache_device_remove_3.ktest +++ b/tests/bcache/bcache_device_remove_3.ktest @@ -2,7 +2,8 @@ require-lib bcache-test-libs.sh -config-cache 16M,16M +# config-cache 16M,16M 16M occasionally causes deadlock in larger runs +config-cache 64M,64M config-tier 512M config-bucket-size 64k config-block-size 4k |