X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2FTEST-02-CRYPTSETUP%2Ftest.sh;h=b2432546dd40d1d715834c3922bce2bf77fad1d7;hb=d8e40d62ab871a87fde421c4b246bb45bc3cbe2d;hp=86617dfc7b217595e822a9edd02ccb44ced124b6;hpb=889a90422dd47284dffa32b9234a6e58991b000c;p=elogind.git diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index 86617dfc7..b2432546d 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -5,9 +5,6 @@ TEST_DESCRIPTION="cryptsetup systemd setup" . $TEST_BASE_DIR/test-functions -# Uncomment this to debug failures -#DEBUGFAIL="systemd.unit=multi-user.target" - check_result_qemu() { ret=1 mkdir -p $TESTDIR/root @@ -28,11 +25,10 @@ check_result_qemu() { test_run() { - if check_qemu ; then - run_qemu + if run_qemu; then check_result_qemu || return 1 else - dwarn "can't run qemu-kvm, skipping" + dwarn "can't run QEMU, skipping" fi return 0 } @@ -70,6 +66,7 @@ EOF setup_testsuite install_dmevent + generate_module_dependencies cat >$initdir/etc/crypttab <