From: Michael Goldish Subject: [KVM-AUTOTEST PATCH 23/28] KVM test: whql.submission: use a different submission name for each submission category Date: Mon, 27 Dec 2010 18:01:50 +0200 Message-ID: <1293465715-16599-23-git-send-email-mgoldish@redhat.com> References: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: In-Reply-To: <1293465715-16599-1-git-send-email-mgoldish@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Signed-off-by: Michael Goldish --- client/tests/kvm/tests/whql_submission.py | 10 +++++----- client/tests/kvm/tests_base.cfg.sample | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/tests/kvm/tests/whql_submission.py b/client/tests/kvm/tests/whql_submission.py index a0ff87c..e40e369 100644 --- a/client/tests/kvm/tests/whql_submission.py +++ b/client/tests/kvm/tests/whql_submission.py @@ -76,12 +76,12 @@ def run_whql_submission(test, params, env): session.close() # Run the automation program on the server + pool_name = "%s_pool" % client_names[0] + submission_name = "%s_%s" % (client_names[0], + params.get("submission_name")) cmd = "%s %s %s %s %s %s" % (os.path.basename(dsso_test_binary), - server_name, - "%s_pool" % client_names[0], - "%s_submission" % client_names[0], - test_timeout, - " ".join(client_names)) + server_name, pool_name, submission_name, + test_timeout, " ".join(client_names)) server_session.sendline(cmd) # Helper function: wait for a given prompt and raise an exception if an diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 83f5e4d..c765463 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -412,12 +412,14 @@ variants: dd_data_whqlqual = Unclassified Signature variants: - tablet: + submission_name = tablet extra_params += " -usbdevice tablet" test_device = HID-compliant mouse test_timeout = 36000 - device: variants: - keyboard: + submission_name = 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. @@ -430,6 +432,7 @@ variants: dd_data_prog = InputKbd dd_data_desc = Input > Keyboard - net: + submission_name = net # Add a support machine and extra NICs vms += " supportvm" nics += " nic2 nic3" @@ -460,6 +463,7 @@ variants: dp_name_serversupportdev = NdistestLanServerSupportDevice0 dp_regex_serversupportdev = RTL8139.*NIC #2$ - hdd: + submission_name = 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\]).)*$ -- 1.7.3.3