Import plainbox-provider-checkbox_0.55.0~rc1.orig.tar.gzupstream-0.55.0_rc1patched-0.55.0_rc1-1

1 files changed, 8 insertions, 187 deletions

diff --git a/units/benchmarks/jobs.pxu b/units/benchmarks/jobs.pxu
index 504401b..fbb9131 100644
--- a/units/benchmarks/jobs.pxu
+++ b/units/benchmarks/jobs.pxu
@@ -36,44 +36,12 @@ plugin: shell
 category_id: com.canonical.plainbox::benchmarks
 id: benchmarks/graphics/render-bench
 requires: package.name == 'render-bench'
-command: /usr/bin/time -f "%e Seconds" render_bench 2>&1 >/dev/null
+command: /usr/bin/time -f "%e Seconds" render_bench > /dev/null 2>&1
 estimated_duration: 52.000
 _description: Run Render-Bench XRender/Imlib2 benchmark
 
 plugin: shell
 category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/qgears2-Xrender-gearsfancy
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="qgears2.render-backend=1; qgears2.test-mode=0" pts_run qgears2
-estimated_duration: 180.000
-_description: Run Qgears2 XRender Extension gearsfancy benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/qgears2-Xrender-compo
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="qgears2.render-backend=1; qgears2.test-mode=2" pts_run qgears2
-estimated_duration: 31.500
-_description: Run Qgears2 XRender Extension image scaling benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/qgears2-gl-gearsfancy
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="qgears2.render-backend=2; qgears2.test-mode=0" pts_run qgears2
-estimated_duration: 52.000
-_description: Run Qgears2 OpenGL gearsfancy benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/qgears2-gl-compo
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="qgears2.render-backend=2; qgears2.test-mode=2" pts_run qgears2
-estimated_duration: 23.000
-_description: Run Qgears2 OpenGL image scaling benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
 id: benchmarks/graphics/glmark2-es2
 requires:
 package.name == 'glmark2-es2'
@@ -95,160 +63,13 @@ _description: Run GLmark2 benchmark
 
 plugin: shell
 category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/unigine-sanctuary
-requires: package.name == 'phoronix-test-suite'
-command: pts_run unigine-sanctuary
-_description: Run Unigine Santuary benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/unigine-tropics
-requires: package.name == 'phoronix-test-suite'
-command: pts_run unigine-tropics
-_description: Run Unigine Tropics benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/unigine-heaven
-requires: package.name == 'phoronix-test-suite'
-command: pts_run unigine-heaven
-_description: Run Unigine Heaven benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/graphics/lightsmark
-requires: package.name == 'phoronix-test-suite'
-command: pts_run lightsmark
-_description: Run Lightsmark benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/cachebench-read
-estimated_duration: 160.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="cachebench.test=0" pts_run cachebench
-_description: Run Cachebench Read benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/cachebench-write
-estimated_duration: 130.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="cachebench.test=1" pts_run cachebench
-_description: Run Cachebench Write benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/cachebench-read-modify-write
-estimated_duration: 140.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="cachebench.test=2" pts_run cachebench
-_description: Run Cachebench Read / Modify / Write benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/stream-copy
-estimated_duration: 6.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="stream.run-type=0" pts_run stream
-_description: Run Stream Copy benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/stream-scale
-estimated_duration: 6.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="stream.run-type=1" pts_run stream
-_description: Run Stream Scale benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/stream-add
-estimated_duration: 5.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="stream.run-type=2" pts_run stream
-_description: Run Stream Add benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/memory/stream-triad
-estimated_duration: 4.0
-requires: package.name == 'phoronix-test-suite'
-command: PRESET_OPTIONS="stream.run-type=3" pts_run stream
-_description: Run Stream Triad benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/network/network-loopback
-requires: package.name == 'phoronix-test-suite'
-command: pts_run network-loopback
-estimated_duration: 85.0
-_description: Run Network Loopback benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
 id: benchmarks/network/wifi_time_to_reconnect
 requires: device.category == 'WIRELESS'
-command: wifi_time2reconnect
+command: wifi_time2reconnect.py
 _description: Check the time needed to reconnect to a WIFI access point
 
 plugin: shell
 category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/encode-mp3
-estimated_duration: 140.0
-requires: package.name == 'phoronix-test-suite'
-command: pts_run encode-mp3
-_description: Run Encode MP3 benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/x264
-estimated_duration: 400.0
-requires: package.name == 'phoronix-test-suite'
-command: pts_run x264
-_description: Run x264 H.264/AVC encoder benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/gnupg
-requires: package.name == 'phoronix-test-suite'
-command: pts_run gnupg
-_description: Run GnuPG benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/compress-pbzip2
-estimated_duration: 90.0
-requires: package.name == 'phoronix-test-suite'
-command: pts_run compress-pbzip2
-_description: Run Compress PBZIP2 benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/compress-7zip
-estimated_duration: 1400
-requires: package.name == 'phoronix-test-suite'
-command: pts_run compress-7zip
-_description: Run Compress 7ZIP benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/n-queens
-estimated_duration: 330.0
-requires: package.name == 'phoronix-test-suite'
-command: pts_run n-queens
-_description: Run N-Queens benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
-id: benchmarks/processor/himeno
-estimated_duration: 75.0
-requires: package.name == 'phoronix-test-suite'
-command: pts_run himeno
-_description: Run Himeno benchmark
-
-plugin: shell
-category_id: com.canonical.plainbox::benchmarks
 id: benchmarks/system/cpu_on_idle
 estimated_duration: 10.0
 requires: package.name == 'sysstat'
@@ -269,7 +90,7 @@ id: benchmarks/graphics/gputest_furmark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
-command: gputest_benchmark fur --width 1920 --height 1080 -f
+command: gputest_benchmark.py fur --width 1920 --height 1080 -f
 estimated_duration: 75.000
 _description:
 Run a stress test based on FurMark (OpenGL 2.1 or 3.2)
@@ -281,7 +102,7 @@ id: benchmarks/graphics/gputest_furmark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
-command: gputest_benchmark fur
+command: gputest_benchmark.py fur
 estimated_duration: 75.000
 _description:
 Run a stress test based on FurMark (OpenGL 2.1 or 3.2)
@@ -293,7 +114,7 @@ id: benchmarks/graphics/gputest_gimark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
-command: gputest_benchmark gi --width 1920 --height 1080 -f
+command: gputest_benchmark.py gi --width 1920 --height 1080 -f
 estimated_duration: 75.00
 _description:
 Run GiMark, a geometry instancing test (OpenGL 3.3)
@@ -305,7 +126,7 @@ id: benchmarks/graphics/gputest_gimark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
-command: gputest_benchmark gi
+command: gputest_benchmark.py gi
 estimated_duration: 75.500
 _description:
 Run GiMark, a geometry instancing test (OpenGL 3.3)
@@ -317,7 +138,7 @@ id: benchmarks/graphics/gputest_tessmark_fullscreen_1920x1080
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
-command: gputest_benchmark tess --width 1920 --height 1080 -f
+command: gputest_benchmark.py tess --width 1920 --height 1080 -f
 estimated_duration: 75.000
 _description:
 Run a tessellation test based on TessMark (OpenGL 4.0)
@@ -329,7 +150,7 @@ id: benchmarks/graphics/gputest_tessmark_windowed_1024x640
 requires:
 package.name == 'gputest'
 cpuinfo.platform == 'x86_64'
-command: gputest_benchmark tess
+command: gputest_benchmark.py tess
 _description:
 Run a tessellation test based on TessMark (OpenGL 4.0)
 Windowed 1024x640 no antialiasing