diff mbox

[v2] KVM test: Enable timedrift for Linux guests

Message ID 20100324062528.14156.16150.stgit@localhost.localdomain (mailing list archive)
State New, archived
Headers show

Commit Message

Jason Wang March 24, 2010, 6:25 a.m. UTC
None
diff mbox

Patch

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"