Merge lp:~afrantzis/mir/mir-perf-framework-package into lp:mir

[Alexandros Frantzis]

benchmarks: Package the Mir performance framework

benchmarks: Package the Mir performance framework

This MP introduces the python3-mir-perf-framework package which includes the framework itself and also a few samples scripts placed in /usr/share/mir-perf-framework.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2723
http://jenkins.qa.ubuntu.com/job/mir-ci/4250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/406
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/406/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3022
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3022/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5832
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21633

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4250/rebuild

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[Gerry Boland (gerboland)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'benchmarks/CMakeLists.txt'
--- benchmarks/CMakeLists.txt	2015-04-28 07:54:10 +0000
+++ benchmarks/CMakeLists.txt	2015-07-02 15:19:49 +0000
@@ -18,3 +18,19 @@
 target_link_libraries(benchmark_multiplexing_dispatchable
   mircommon
 )
+
+# Note: We need to write \$ENV{DESTDIR} (note the \$) to make
+# CMake replace the DESTDIR variable at installation time rather
+# than configuration time
+install(CODE "execute_process(COMMAND python3 mir_perf_framework_setup.py install -f --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} --install-layout=deb --no-compile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
+
+set(MIR_PERF_SCRIPTS
+  key_event_latency.py
+  nested_client_to_display_buffer_latency.py
+  touch_event_latency.py
+)
+
+install(
+  FILES ${MIR_PERF_SCRIPTS}
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mir-perf-framework
+)

=== modified file 'benchmarks/key_event_latency.py'
--- benchmarks/key_event_latency.py	2015-06-26 11:31:44 +0000
+++ benchmarks/key_event_latency.py	2015-07-02 15:19:49 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/python3
+
 from mir_perf_framework import PerformanceTest, Server, Client
 import time
 import evdev

=== added file 'benchmarks/mir_perf_framework_setup.py'
--- benchmarks/mir_perf_framework_setup.py	1970-01-01 00:00:00 +0000
+++ benchmarks/mir_perf_framework_setup.py	2015-07-02 15:19:49 +0000
@@ -0,0 +1,5 @@
+from distutils.core import setup
+
+setup(name='mir_perf_framework',
+      version='0.1',
+      packages=['mir_perf_framework'])

=== modified file 'benchmarks/nested_client_to_display_buffer_latency.py'
--- benchmarks/nested_client_to_display_buffer_latency.py	2015-06-26 08:45:29 +0000
+++ benchmarks/nested_client_to_display_buffer_latency.py	2015-07-02 15:19:49 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/python3
+
 from mir_perf_framework import PerformanceTest, Server, Client
 import time
 import statistics

=== modified file 'benchmarks/touch_event_latency.py'
--- benchmarks/touch_event_latency.py	2015-07-02 15:19:49 +0000
+++ benchmarks/touch_event_latency.py	2015-07-02 15:19:49 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/python3
+
 from mir_perf_framework import PerformanceTest, Server, Client
 import time
 import evdev

=== modified file 'debian/control'
--- debian/control	2015-06-29 03:29:31 +0000
+++ debian/control	2015-07-02 15:19:49 +0000
@@ -41,6 +41,8 @@
                abi-compliance-checker,
                libevdev-dev,
                uuid-dev,
+               python3,
+               dh-python,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/mir
 # If you aren't a member of ~mir-team but need to upload packaging changes,
@@ -395,3 +397,20 @@
  .
  This package depends on a full set of graphics drivers for running Mir on top
  of an existing Android driver stack.
+
+Package: python3-mir-perf-framework
+Section: python
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         python3-evdev,
+         python3-babeltrace,
+         mir-demos
+Description: Display server for Ubuntu - performance testing framework
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ This package contains a python3 framework to facilitate writing performance
+ tests for Mir. It also contains a few interesting performance tests written
+ using the framework.

=== added file 'debian/python3-mir-perf-framework.install'
--- debian/python3-mir-perf-framework.install	1970-01-01 00:00:00 +0000
+++ debian/python3-mir-perf-framework.install	2015-07-02 15:19:49 +0000
@@ -0,0 +1,3 @@
+usr/lib/python3/dist-packages/mir_perf_framework/*.py
+usr/lib/python3/dist-packages/*.egg-info
+usr/share/mir-perf-framework

=== modified file 'debian/rules'
--- debian/rules	2015-06-18 02:46:16 +0000
+++ debian/rules	2015-07-02 15:19:49 +0000
@@ -8,7 +8,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 %:
-	dh $@ --parallel --fail-missing
+	dh $@ --parallel --fail-missing --with python3
 
 # Enable verbose debugging output from the testsuite
 export MIR_SERVER_LOGGING = on

=== modified file 'doc/performance_framework.md'
--- doc/performance_framework.md	2015-07-02 15:19:49 +0000
+++ doc/performance_framework.md	2015-07-02 15:19:49 +0000
@@ -13,11 +13,19 @@
 To run a test, just execute the python3 script containing it.
 
 We need to ensure that the Mir performance framework can be found by python.
-To do so, add the directory containing the mir_perf_framework/ directory (i.e.,
-its parent directory) to the PYTHONPATH env. variable:
+If you have installed the Mir performance framework to one of the standard
+python3 library locations (e.g., with make install or a package installation),
+then the framework should be automatically detected. If you are using the
+framework from within the source tree you need to add the directory containing
+the mir_perf_framework/ directory (i.e., its parent directory) to the
+PYTHONPATH env. variable:
 
     sudo PYTHONPATH=/path/to/mir/benchmarks python3 testscript.py
 
+If you are using an Ubuntu system the framework comes pre-packaged in the
+python3-mir-perf-framework package, which, besides the framework itself,
+also installs a few interesting tests in /usr/share/mir-perf-framework/.
+
 Writing test scripts
 --------------------