From patchwork Tue Jun 16 07:37:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 30552 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5G7YCah005589 for ; Tue, 16 Jun 2009 07:34:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752302AbZFPHeF (ORCPT ); Tue, 16 Jun 2009 03:34:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752435AbZFPHeE (ORCPT ); Tue, 16 Jun 2009 03:34:04 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55338 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752257AbZFPHeC (ORCPT ); Tue, 16 Jun 2009 03:34:02 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5G7Y5XW006871; Tue, 16 Jun 2009 03:34:05 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5G7Y4hg019408; Tue, 16 Jun 2009 03:34:04 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5G7Y0qY013224; Tue, 16 Jun 2009 03:34:03 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 2/2] KVM test: include shutdown test in kvm_tests.cfg.sample Date: Tue, 16 Jun 2009 10:37:10 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The shutdown test should always be last -- new tests will be added above it. If the user chooses to run all tests on a guest, the guest will be shut down by the final shutdown test. If the user selects a specific subset of the tests, the guest will shut down if the shutdown test is included in this subset. Note that this only applies to the last guest of the job; since currently all guests use the same VM object (vm1), the VM is shut down automatically when it's passed from one guest to the next. In short, standard test sets (weekly, daily, per-release) should include the shutdown test. In particular, tests running from the server should include it. Custom test sets run in client mode, intended for testing/developing a specific test or a set of tests, may run without the shutdown test. The shutdown test is defined with 'kill_vm = yes', so if the test fails to shut the guest down nicely, the postprocessor will take care of it. Also added 'kill_vm_on_error = yes' to 'setup' tests, because if a setup test fails, shutdown will not run, so the setup test must take care of shutting the VM down. Install tests already have this defined. Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_tests.cfg.sample | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 54c9975..412c4b0 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -41,6 +41,7 @@ variants: fail_if_stuck_for = 300 stuck_detection_history = 2 keep_screendump_history = yes + kill_vm_on_error = yes - boot: install setup type = boot @@ -83,6 +84,12 @@ variants: - linux_s3: install setup type = linux_s3 + - shutdown: install setup + type = shutdown + kill_vm = yes + kill_vm_gracefully = no + + # NICs variants: - @rtl8139: @@ -544,7 +551,7 @@ variants: only default only up only Fedora.8.32 - only install setup boot + only install setup boot shutdown only rtl8139 - @sample1: only qcow2