From patchwork Mon Jul 20 15:07:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 36356 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 n6KF4JvD016769 for ; Mon, 20 Jul 2009 15:04:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752062AbZGTPDl (ORCPT ); Mon, 20 Jul 2009 11:03:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751813AbZGTPDk (ORCPT ); Mon, 20 Jul 2009 11:03:40 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59939 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751544AbZGTPDg (ORCPT ); Mon, 20 Jul 2009 11:03:36 -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 n6KF3alX000618; Mon, 20 Jul 2009 11:03:36 -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 n6KF3ZLi025240; Mon, 20 Jul 2009 11:03:35 -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 n6KF39lS007669; Mon, 20 Jul 2009 11:03:33 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 15/17] KVM test: add timedrift test to kvm_tests.cfg.sample Date: Mon, 20 Jul 2009 18:07:22 +0300 Message-Id: In-Reply-To: References: <1248102444-31111-1-git-send-email-mgoldish@redhat.com> <4980fdb4f9630c89ba21bd4af49a3b7626fb29f1.1248102188.git.mgoldish@redhat.com> <747abbb55932d4fde553cf5187f7481aaced4d8c.1248102188.git.mgoldish@redhat.com> <53d7f316f181c7efb429e7b9f138ed3e8b239cce.1248102188.git.mgoldish@redhat.com> <7c14834269583764af3beb2e811ac62bec3a2c96.1248102188.git.mgoldish@redhat.com> <7f24fe107f3dc8e2693e12142ba97010c7063166.1248102188.git.mgoldish@redhat.com> <79d9f4e9e8ca62388f1a8be1a0f450a2f2329fc3.1248102188.git.mgoldish@redhat.com> <8cb328ac5429d808714dd252a456e6d3dd3a96b2.1248102188.git.mgoldish@redhat.com> 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 Currently the test will only run on Windows. It should be able to run on Linux just as well, but if I understand correctly, testing time drift on Linux is less interesting. Also make some tiny cosmetic changes (spacing), and move the stress_boot test before the shutdown test (shutdown should be last). Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_tests.cfg.sample | 46 ++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 1288952..2d75a66 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -92,20 +92,33 @@ variants: test_name = disktest test_control_file = disktest.control - - linux_s3: install setup + - linux_s3: install setup type = linux_s3 - - shutdown: install setup + - timedrift: install setup + type = timedrift + extra_params += " -rtc-td-hack" + # Pin the VM and host load to CPU #0 + cpu_mask = 0x1 + # Set the load and rest durations + load_duration = 20 + rest_duration = 20 + # Fail if the drift after load is higher than 50% + drift_threshold = 50 + # Fail if the drift after the rest period is higher than 10% + drift_threshold_after_rest = 10 + + - stress_boot: install setup + type = stress_boot + max_vms = 5 + alive_test_cmd = ps aux + + - shutdown: install setup type = shutdown kill_vm = yes kill_vm_gracefully = no - - stress_boot: - type = stress_boot - max_vms = 5 - alive_test_cmd = ps aux - # NICs variants: - @rtl8139: @@ -121,6 +134,7 @@ variants: variants: # Linux section - @Linux: + no timedrift cmd_shutdown = shutdown -h now cmd_reboot = shutdown -r now ssh_status_test_command = echo $? @@ -303,8 +317,6 @@ variants: md5sum=bf4635e4a4bd3b43838e72bc8c329d55 md5sum_1m=18ecd37b639109f1b2af05cfb57dfeaf - - # Windows section - @Windows: no autotest @@ -318,6 +330,21 @@ variants: migration_test_command = ver && vol stress_boot: alive_test_cmd = systeminfo + timedrift: + # For this to work, the ISO should contain vlc (vlc.exe) and a video (ED_1024.avi) + cdrom = windows/vlc.iso + time_command = "echo TIME: %date% %time%" + time_filter_re = "(?<=TIME: \w\w\w ).{19}(?=\.\d\d)" + time_format = "%m/%d/%Y %H:%M:%S" + guest_load_command = 'cmd /c "d:\vlc -f --loop --no-qt-privacy-ask --no-qt-system-tray d:\ED_1024.avi"' + # Alternative guest load: + #guest_load_command = "(dir /s && dir /s && dir /s && dir /s) > nul" + guest_load_stop_command = "taskkill /F /IM vlc.exe" + guest_load_instances = 2 + host_load_command = "bzip2 -c --best /dev/urandom > /dev/null" + # Alternative host load: + #host_load_command = "dd if=/dev/urandom of=/dev/null" + host_load_instances = 8 variants: - Win2000: @@ -582,5 +609,6 @@ variants: only qcow2.*ide.*default.*up.*Ubuntu-8.10-server.*(autotest.sleeptest) only rtl8139 + # Choose your test list only fc8_quick