From 459bdfc394a38eb7a4cd05ac3e8d32680e73294d Mon Sep 17 00:00:00 2001
From: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Date: Tue, 18 Feb 2014 11:41:40 +0000
Subject: KVM: added parsing hackbench measurements

rt-tests hackbench was replaced with the version from Ingo Molnar
http://people.redhat.com/mingo/cfs-scheduler/tools/hackbench.c
hackbench is now called from both host and guest the same way:
hackbench 100 process 500
The results are parsed using min_max_avg_parse.py. Result regexp
was updated to match the output format of the script.

Change-Id: I5d437565d42f45c9411dc8b62540be7b53e0c630
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
---
 ubuntu/kvm.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'ubuntu')

diff --git a/ubuntu/kvm.yaml b/ubuntu/kvm.yaml
index 1e44ab4..337492a 100644
--- a/ubuntu/kvm.yaml
+++ b/ubuntu/kvm.yaml
@@ -17,15 +17,23 @@ install:
     deps:
         - qemu-system
         - qemu-utils
-        - rt-tests
+        - python-numpy
         - uml-utilities
         - bridge-utils
         - udhcpc
+        - wget
+    steps:
+        - 'wget http://people.redhat.com/mingo/cfs-scheduler/tools/hackbench.c'
+        - 'gcc -g -Wall -O2 -o hackbench hackbench.c -lpthread'
+        - 'cp hackbench /usr/bin/'
+
 run:
     steps:
         - 'sudo ./common/scripts/kvm/test-host.sh'
         - 'sudo ./common/scripts/kvm/test-kvm.sh'
-        - "lava-test-run-attach kvm-log.txt text/plain"
+        - 'sudo ./common/scripts/kvm/test-rt-parse.sh'
+        - 'lava-test-run-attach kvm-log.txt text/plain'
+        - 'lava-test-run-attach guest.log text/plain'
 
 parse:
-    pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))"
+    pattern: '^(?P<test_case_id>[^:]+):\s*(?P<measurement>[0-9.]+)\s+(?P<units>\w+)\s+(?P<result>\w+)'
-- 
cgit v1.2.3