From: Michael Goldish <mgoldish@redhat.com>
To: autotest@test.kernel.org, kvm@vger.kernel.org
Subject: [KVM-AUTOTEST PATCH 20/28] KVM test: whql.submission: add unclassified USB tablet tests
Date: Mon, 27 Dec 2010 18:01:47 +0200 [thread overview]
Message-ID: <1293465715-16599-20-git-send-email-mgoldish@redhat.com> (raw)
In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com>
Group all device tests under a 'device' variant and create a new 'unclassified'
variant that currently contains only the tablet tests.
Signed-off-by: Michael Goldish <mgoldish@redhat.com>
---
client/tests/kvm/tests_base.cfg.sample | 134 ++++++++++++++++++--------------
1 files changed, 77 insertions(+), 57 deletions(-)
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 351ce99..8d533ba 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -386,55 +386,68 @@ variants:
# Exclude jobs that have '(Manual)' in their names
job_filter = ^((?!\(Manual\)).)*$
variants:
- - keyboard:
- # test_device is a regular expression that should match a device's
- # name as it appears in device manager. The first device that matches
- # is used.
- test_device = keyboard
- # Set timeout to 10 hours
- test_timeout = 36000
- dd_data_cat0 = Input\Keyboard
- dd_data_cat1 = Device Fundamentals
- dd_data_cat2 = System Fundamentals\Dynamic Partitioning
- dd_data_prog = InputKbd
- dd_data_desc = Input > Keyboard
- - hdd:
- # 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
- dd_data_cat2 = Storage\Device Class\Disk\Bus\ATA
- dd_data_cat3 = Device Fundamentals
- dd_data_prog = StorHDD
- dd_data_desc = Storage > Hard Disk Drive (HDD)
- dd_name_ex0 = Storage_bus_type
- dd_data_ex0 = ATA/ATAPI
- dd_name_ex1 = Hybrid_HDD_Support
- dd_data_ex1 = 0
- dd_name_ex2 = Non_Rotating_Media
- 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"
+ - unclassified:
+ dd_data_cat0 = Device Fundamentals
+ dd_data_cat1 = System Fundamentals\Dynamic Partitioning
+ dd_data_prog = Unclassified
+ dd_data_desc = Unclassified
+ dd_data_whqlqual = Unclassified Signature
variants:
- - full:
- # Yes, 100 hours, this is not a mistake
- test_timeout = 360000
- - syscache_test:
- job_filter = syscache test
- test_timeout = 7200
+ - tablet:
+ extra_params += " -usbdevice tablet"
+ test_device = HID-compliant mouse
+ test_timeout = 36000
+ - device:
+ variants:
+ - keyboard:
+ # test_device is a regular expression that should match a device's
+ # name as it appears in device manager. The first device that matches
+ # is used.
+ test_device = keyboard
+ # Set timeout to 10 hours
+ test_timeout = 36000
+ dd_data_cat0 = Input\Keyboard
+ dd_data_cat1 = Device Fundamentals
+ dd_data_cat2 = System Fundamentals\Dynamic Partitioning
+ dd_data_prog = InputKbd
+ dd_data_desc = Input > Keyboard
+ - hdd:
+ # Run the tests on a non-system drive
+ # (match device names 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
+ dd_data_cat2 = Storage\Device Class\Disk\Bus\ATA
+ dd_data_cat3 = Device Fundamentals
+ dd_data_prog = StorHDD
+ dd_data_desc = Storage > Hard Disk Drive (HDD)
+ dd_name_ex0 = Storage_bus_type
+ dd_data_ex0 = ATA/ATAPI
+ dd_name_ex1 = Hybrid_HDD_Support
+ dd_data_ex1 = 0
+ dd_name_ex2 = Non_Rotating_Media
+ 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
+ test_timeout = 360000
+ - syscache_test:
+ job_filter = syscache test
+ test_timeout = 7200
- guest_s4: install setup unattended_install.cdrom
type = guest_s4
@@ -1722,7 +1735,8 @@ variants:
dd_data_logoarch = X86
dd_data_logoos = Windows XP
dd_data_whqlos = Windows XP
- dd_data_whqlqual = Basic
+ device:
+ dd_data_whqlqual = Basic
- 64:
image_name += -64
@@ -1752,7 +1766,8 @@ variants:
dd_data_logoarch = AMD64
dd_data_logoos = Windows XP 64-Bit Edition Version 2003
dd_data_whqlos = Windows XP x64
- dd_data_whqlqual = Basic
+ device:
+ dd_data_whqlqual = Basic
- Win2003:
image_name = win2003
@@ -1786,7 +1801,8 @@ variants:
dd_data_logoarch = X86
dd_data_logoos = Windows Server 2003
dd_data_whqlos = Windows Server 2003
- dd_data_whqlqual = Basic
+ device:
+ dd_data_whqlqual = Basic
- 64:
image_name += -64
@@ -1810,13 +1826,13 @@ variants:
virtio_oemsetup_id = WNET64
virtio_network_path = 'F:\NetKVM\2k3\amd64'
#virtio_network_installer_path = 'F:\RHEV-Network64.msi'
-
whql.submission:
desc_path_desc1 = $\WDK\Logo Type\Device Logo\Windows Server 2003
dd_data_logoarch = AMD64
dd_data_logoos = Windows Server 2003
dd_data_whqlos = Windows Server 2003 x64
- dd_data_whqlqual = Basic
+ device:
+ dd_data_whqlqual = Basic
- WinVista:
image_name = winvista
@@ -1832,7 +1848,8 @@ variants:
dd_data_logoarch = X86
dd_data_logoos = Windows Vista
dd_data_whqlos = Windows Vista Client
- dd_data_whqlqual = Premium
+ device:
+ dd_data_whqlqual = Premium
variants:
- sp1:
image_name += -sp1-32
@@ -1878,7 +1895,8 @@ variants:
dd_data_logoarch = AMD64
dd_data_logoos = Windows Vista
dd_data_whqlos = Windows Vista Client x64
- dd_data_whqlqual = Premium
+ device:
+ dd_data_whqlqual = Premium
variants:
- sp1:
image_name += -sp1-64
@@ -2059,7 +2077,8 @@ variants:
dd_data_logoarch = X86
dd_data_logoos = Windows 7
dd_data_whqlos = Windows 7 Client
- dd_data_whqlqual = Logo
+ device:
+ dd_data_whqlqual = Logo
- 64:
image_name += -64
@@ -2089,7 +2108,8 @@ variants:
dd_data_logoarch = AMD64
dd_data_logoos = Windows 7
dd_data_whqlos = Windows 7 Client x64
- dd_data_whqlqual = Logo
+ device:
+ dd_data_whqlqual = Logo
# Unix/BSD section
--
1.7.3.3
next prev parent reply other threads:[~2010-12-27 16:01 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-27 16:01 [KVM-AUTOTEST PATCH 01/28] KVM test: introduce a helper class to run a function in the background Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 02/28] KVM test: kvm_utils.py: add a convenience function to run functions in parallel Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 03/28] KVM test: corrections to migration_with_reboot Michael Goldish
2010-12-28 12:25 ` [Autotest] " Jason Wang
2010-12-28 12:42 ` Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 04/28] KVM test: migration_with_reboot: use kvm_utils.Thread Michael Goldish
2010-12-28 12:27 ` [Autotest] " Jason Wang
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 05/28] KVM test: vmstop: " Michael Goldish
2010-12-28 12:29 ` [Autotest] " Jason Wang
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 06/28] KVM test: migration_with_file_transfer: " Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 07/28] KVM test: migration_with_file_transfer: use unique host filename Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 08/28] KVM test: migration_with_file_transfer: verify transfer correctness Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 09/28] KVM test: remove kvm_test_utils.BackgroundTest Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 10/28] KVM test: avoid printing address cache messages too often Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 11/28] KVM test: make_qemu_command(): catch IndexError when accessing self.netdev_id Michael Goldish
2010-12-28 13:23 ` [Autotest] " Jason Wang
2010-12-28 14:23 ` Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 12/28] KVM test: use VM.clone() in make_qemu_command() Michael Goldish
2010-12-28 13:13 ` Jason Wang
2010-12-28 14:17 ` Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 13/28] KVM test: don't print the contents of env before and after tests Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 14/28] KVM test: fix md5sum verification of ISO files Michael Goldish
2010-12-28 13:25 ` Jason Wang
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 15/28] KVM test: kvm_subprocess.py: increase default timeout from 30 to 60 secs Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 16/28] KVM test: whql_submission: run a user specified shell command before the test Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 17/28] KVM test: whql_submission: make the HDD tests run on a non-system drive Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 18/28] KVM test: whql: rename the whql_submission variant to whql.submission Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 19/28] KVM test: whql.submission: don't run jobs that require manual intervention Michael Goldish
2010-12-27 16:01 ` Michael Goldish [this message]
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 21/28] KVM test: refactor whql_submission_15.cs and whql_submission.py Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 22/28] KVM test: whql: add a network submission Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 23/28] KVM test: whql.submission: use a different submission name for each submission category Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 24/28] KVM test: whql.client_install: setup auto logon for DTMLLUAdminUser Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 25/28] KVM test: whql.submission: don't use any cdroms Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 26/28] KVM test: whql.submission: support VirtIO network tests Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 27/28] KVM test: whql.submission: reorder DeviceData Michael Goldish
2010-12-27 16:01 ` [KVM-AUTOTEST PATCH 28/28] KVM test: whql_submission.py: log in using all NICs before running tests Michael Goldish
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1293465715-16599-20-git-send-email-mgoldish@redhat.com \
--to=mgoldish@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox