One of the tests refuses to run on a system drive, so: - Add a 2nd disk to the qemu command line and create a 4G image for it - Partition the 2nd disk and assign D: to it before running the tests - Tell the tests to run on a non-system drive
Signed-off-by: Michael Goldish <[email protected]> --- client/tests/kvm/tests_base.cfg.sample | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index ff02a72..147d89a 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -397,7 +397,9 @@ variants: dd_data_prog = InputKbd dd_data_desc = Input > Keyboard - hdd: - test_device = qemu harddisk + # Run the tests on a non-system drive + # (match devices that contain 'QEMU HARDDISK' and do not contain '[C]') + test_device = ^(?=.*?\bQEMU HARDDISK\b)((?!\[C\]).)*$ device_data += " ex0 ex1 ex2 ex3" dd_data_cat0 = Storage\Device Class\Disk\Disk dd_data_cat1 = Storage\Device Class\Disk\Fixed @@ -413,6 +415,17 @@ variants: dd_data_ex2 = 0 dd_name_ex3 = Secure_Storage dd_data_ex3 = 0 + # Add a 2nd disk which will become D: + images += " tmp" + image_name_tmp = tmp + image_size_tmp = 4G + force_create_image_tmp = yes + # Run diskpart to partition the 2nd disk + whql_pre_command = "echo select disk=1 > dp.txt && " + whql_pre_command += "echo create partition primary >> dp.txt && " + whql_pre_command += "echo assign letter=d >> dp.txt && " + whql_pre_command += "diskpart /s dp.txt & " + whql_pre_command += "format d: /fs:ntfs /q /y" variants: - full: # Yes, 100 hours, this is not a mistake -- 1.7.3.3 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
