From patchwork Wed Mar 24 06:25:28 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jason Wang <jasowang@redhat.com>
X-Patchwork-Id: 87822
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2O6L9j7001759
	for <patchwork-kvm@patchwork.kernel.org>;
	Wed, 24 Mar 2010 06:21:09 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754849Ab0CXGVG (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 24 Mar 2010 02:21:06 -0400
Received: from mx1.redhat.com ([209.132.183.28]:62844 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754799Ab0CXGVF (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 24 Mar 2010 02:21:05 -0400
Received: from int-mx05.intmail.prod.int.phx2.redhat.com
	(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2O6L1qi015567
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Wed, 24 Mar 2010 02:21:02 -0400
Received: from localhost.localdomain ([10.66.91.25])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o2O6KxZO029933; Wed, 24 Mar 2010 02:21:00 -0400
Subject: [PATCH v2] KVM test: Enable timedrift for Linux guests
To: lmr@redhat.com, kvm@vger.kernel.org, autotest@kernel.org
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 24 Mar 2010 14:25:28 +0800
Message-ID: <20100324062528.14156.16150.stgit@localhost.localdomain>
User-Agent: StGit/0.15
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 24 Mar 2010 06:21:09 +0000 (UTC)


diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index 8cc83a9..29a2430 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -147,7 +147,6 @@ variants:
         type = linux_s3
 
     - timedrift:    install setup unattended_install
-        extra_params += " -rtc-td-hack"
         variants:
             - with_load:
                 type = timedrift
@@ -330,7 +329,7 @@ variants:
 variants:
     # Linux section
     - @Linux:
-        no timedrift autoit
+        no autoit
         shutdown_command = shutdown -h now
         reboot_command = shutdown -r now
         status_test_command = echo $?
@@ -342,6 +341,16 @@ variants:
         file_transfer_port = 22
         mem_chk_cmd = dmidecode -t 17 | awk -F: '/Size/ {print $2}'
         cpu_chk_cmd = grep -c processor /proc/cpuinfo
+        timedrift:
+            extra_params += " -no-kvm-pit-reinjection"
+            time_command = date +'TIME: %a %m/%d/%Y %H:%M:%S.%N'
+            time_filter_re = "(?:TIME: \w\w\w )(.{19})(?:\.\d\d)"
+            time_format = "%m/%d/%Y %H:%M:%S"
+            guest_load_command = "dd if=/dev/urandom of=/dev/null"
+            guest_load_instances = 2
+            guest_load_stop_command = "killall -9 dd"
+            host_load_command = "bzip2 -c --best /dev/urandom > /dev/null"
+            host_load_instances = 8
 
         variants:
             - Fedora:
@@ -717,6 +726,7 @@ variants:
         stress_boot:
             alive_test_cmd = systeminfo
         timedrift:
+            extra_params += " -rtc-td-hack"
             time_command = "echo TIME: %date% %time%"
             time_filter_re = "(?<=TIME: \w\w\w ).{19}(?=\.\d\d)"
             time_format = "%m/%d/%Y %H:%M:%S"