[Branch,~linaro-validation/lava-test/trunk] Rev 143: Merge rewritten perf test

Message ID 20120419143711.24793.97999.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki April 19, 2012, 2:37 p.m.
Merge authors:
  Avik Sil (aviksil)
Related merge proposals:
  https://code.launchpad.net/~linaro-foundations/lava-test/lava-test-perf/+merge/101358
  proposed by: Avik Sil (aviksil)
  review: Approve - Ricardo Salveti (rsalveti)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 143 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Thu 2012-04-19 16:35:00 +0200
message:
  Merge rewritten perf test
modified:
  doc/changes.rst
  lava_test/test_definitions/perf.py


--
lp:lava-test
https://code.launchpad.net/~linaro-validation/lava-test/trunk

You are subscribed to branch lp:lava-test.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-test/trunk/+edit-subscription

Patch

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-03-27 12:42:34 +0000
+++ doc/changes.rst	2012-04-19 14:35:00 +0000
@@ -6,6 +6,8 @@ 
 Version 0.7 (UNRELEASED)
 ========================
 
+* Add perf test
+
 .. _version_0_6:
 
 Version 0.6

=== modified file 'lava_test/test_definitions/perf.py'
--- lava_test/test_definitions/perf.py	2012-03-17 11:02:42 +0000
+++ lava_test/test_definitions/perf.py	2012-04-19 14:35:00 +0000
@@ -1,4 +1,4 @@ 
-# Copyright (c) 2010, 2011 Linaro
+# Copyright (c) 2010-2012 Linaro
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,10 +14,10 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-A simple test for the perf performance counters subsystem in Linux.  This 
-currently just runs 'perf test' sanity tests built into the perf tool
+A simple test for the perf performance counters subsystem in Linux. This
+currently executes various perf commands built into the perf tool
 
-**URL:** None
+**URL:** https://code.launchpad.net/~linaro-maintainers/lava-test/lava-test-perf
 
 **Default options:** None
 """
@@ -28,20 +28,18 @@ 
 from lava_test.core.tests import Test
 
 DEFAULT_OPTIONS = ""
-DEPS = ["linux-tools"]
-
-RUNSTEPS = [
-    ("export PERFBIN=`find /usr/bin/ -name perf_*"
-     " | sort -r"
-     " | head -n 1"
-     " | xargs basename`;"
-     " $PERFBIN test 2>&1 $(OPTIONS)")]
-
-PATTERN = "^ \d+:\s+(?P<test_case_id>[\w\s]+):\W+(?P<message>\w+)"
-
-installer = TestInstaller(deps=DEPS)
+DEPS = ["linux-tools", "stress"]
+INSTALLSTEPS = ["bzr branch lp:~linaro-maintainers/lava-test/lava-test-perf"]
+RUNSTEPS = ["cp lava-test-perf/run-perf-test.sh .; sudo bash ./run-perf-test.sh"]
+PATTERN = "^(?P<test_case_id>[\w\s-]+)\s+:\s+(?P<result>\w+)"
+FIXUPS = {
+    "PASS": "pass",
+    "FAIL": "fail"
+}
+
+installer = TestInstaller(INSTALLSTEPS, deps=DEPS)
 runner = TestRunner(RUNSTEPS, default_options=DEFAULT_OPTIONS)
-parser = TestParser(PATTERN, appendall={"result": "pass"})
+parser = TestParser(PATTERN, fixupdict=FIXUPS)
 
 testobj = Test(
     test_id="perf",