merge with trtrunk

10 files changed, 131 insertions, 106 deletions

diff --git a/jobs/audio.txt.in b/jobs/audio.txt.in
index d29213f..588668f 100644
--- a/jobs/audio.txt.in
+++ b/jobs/audio.txt.in
@@ -97,6 +97,32 @@ command:
 EOF
 
 plugin: user-interact-verify
+id: audio/playback_thunderbolt
+estimated_duration: 30.0
+imports: from 2013.com.canonical.plainbox import manifest
+requires:
+ manifest.has_thunderbolt == 'True'
+ device.category == 'AUDIO'
+ package.name == 'alsa-base'
+ package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
+ package.name == 'pulseaudio-utils'
+command:
+ audio_settings store --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
+ audio_settings set --verbose --device=hdmi --volume=50
+ gst_pipeline_test -t 2 --device hdmi 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'
+ EXIT_CODE=$?
+ audio_settings restore --verbose --file=$PLAINBOX_SESSION_SHARE/pulseaudio_settings
+ exit $EXIT_CODE
+_description:
+ PURPOSE:
+ Thunderbolt audio interface verification
+ STEPS:
+ 1. Plug an external Thunderbolt device with sound (Use only one HDMI/DisplayPort/Thunderbolt interface at a time for this test)
+ 2. Click the Test button
+ VERIFICATION:
+ Did you hear the sound from the Thunderbolt device?
+
+plugin: user-interact-verify
 id: audio/playback_headphones
 estimated_duration: 20.0
 depends: audio/list_devices
diff --git a/jobs/benchmarks.txt.in b/jobs/benchmarks.txt.in
index 3550261..d4abcbe 100644
--- a/jobs/benchmarks.txt.in
+++ b/jobs/benchmarks.txt.in
@@ -96,15 +96,6 @@ estimated_duration: 306.000
 _description: Run GLmark2 benchmark
 
 plugin: shell
-id: benchmarks/graphics/globs
-requires:
- package.name == 'globs'
- cpuinfo.platform in ("i386", "x86_64")
-command: glob_test --min-fps=26 --ignore-problems
-estimated_duration: 53.500
-_description: Run globs benchmark
-
-plugin: shell
 id: benchmarks/graphics/unigine-sanctuary
 requires: package.name == 'phoronix-test-suite'
 command: pts_run unigine-sanctuary
diff --git a/jobs/disk.txt.in b/jobs/disk.txt.in
index 242731a..446ce79 100644
--- a/jobs/disk.txt.in
+++ b/jobs/disk.txt.in
@@ -64,7 +64,7 @@ command:
 description:
 This tests the SMART capabilities for $product (Note that this test will not work against hardware RAID)
 user: root
- command: disk_smart -b /dev/`ls /sys$path/block | sed 's|!|/|'` -s 130 -t 270
+ command: disk_smart -b /dev/`ls /sys$path/block | sed 's|!|/|'` -s 130 -t 530
 EOF
 
 plugin: local
diff --git a/jobs/graphics-legacy.txt.in b/jobs/graphics-legacy.txt.in
index 02c9ef6..9c2ef40 100644
--- a/jobs/graphics-legacy.txt.in
+++ b/jobs/graphics-legacy.txt.in
@@ -44,7 +44,7 @@ id: graphics/screen-resolution
 requires:
 device.category == 'VIDEO'
 package.name == 'qmlscene'
-command: qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
+command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10.0
 _summary: Test default resolution
 _description:
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 5750bf1..4eb0e47 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -101,7 +101,7 @@ command:
 requires:
 device.category == 'VIDEO'
 package.name == 'qmlscene'
- command: qmlscene --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
+ command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10.0
 _summary: Test default resolution for $product
 _description:
diff --git a/jobs/local.txt.in b/jobs/local.txt.in
index 9bd5934..90102ca 100644
--- a/jobs/local.txt.in
+++ b/jobs/local.txt.in
@@ -229,13 +229,6 @@ command:
 shopt -s extglob
 cat $PLAINBOX_PROVIDER_DATA/../jobs/peripheral.txt?(.in)
 
-id: __piglit__
-plugin: local
-_description: Piglit tests
-command:
- shopt -s extglob
- cat $PLAINBOX_PROVIDER_DATA/../jobs/piglit.txt?(.in)
-
 id: __power-management__
 plugin: local
 _description: Power Management tests
@@ -257,6 +250,13 @@ command:
 shopt -s extglob
 cat $PLAINBOX_PROVIDER_DATA/../jobs/suspend.txt?(.in)
 
+id: __thunderbolt__
+plugin: local
+_description: Thunderbolt tests
+command:
+ shopt -s extglob
+ cat $PLAINBOX_PROVIDER_DATA/../jobs/thunderbolt.pxu
+
 id: __touchpad__
 plugin: local
 _description: Touchpad tests
diff --git a/jobs/monitor.txt.in b/jobs/monitor.txt.in
index 98a68bd..82899c5 100644
--- a/jobs/monitor.txt.in
+++ b/jobs/monitor.txt.in
@@ -175,3 +175,20 @@ command:
 Was your screen dimmed approximately to half of the maximum brightness?
 EOF
 
+plugin: manual
+id: monitor/thunderbolt
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_thunderbolt == 'True'
+_summary: Display connected via Thunderbolt
+_description:
+ PURPOSE:
+ This test will check your Thunderbolt port as a monitor interconnect.
+ STEPS:
+ 1. Connect a display (if not already connected) to the Thunderbolt port on
+ your system
+ 2. Switch display modes between in your Display Settings, check if it can be
+ set to mirrored, extended, displayed on external or onboard only
+ VERIFICATION:
+ Was the desktop displayed correctly on the Thunderbolt-connected screen in
+ every mode?
+
diff --git a/jobs/piglit.txt.in b/jobs/piglit.txt.in
deleted file mode 100644
index 445ef73..0000000
--- a/jobs/piglit.txt.in
+++ /dev/null
@@ -1,81 +0,0 @@
-plugin: shell
-id: piglit/fbo
-requires:
- package.name == 'piglit'
-command: piglit_test -t ^spec/EXT_framebuffer_object -n fbo
-estimated_duration: 28.000
-_description:
- Runs piglit tests for checking support for framebuffer object operations, depth buffer and stencil buffer
-
-plugin: shell
-id: piglit/gl-2.1
-requires:
- package.name == 'piglit'
-command: piglit_test -t spec/'!OpenGL 2.1'/ -n gl-2.1
-estimated_duration: 2.500
-_description:
- Runs piglit tests for checking OpenGL 2.1 support
-
-plugin: shell
-id: piglit/vbo
-requires:
- package.name == 'piglit'
-command: piglit_test -t spec/ARB_vertex_buffer_object/ -n vbo
-estimated_duration: 0.430
-_description:
- Runs piglit tests for checking support for vertex buffer object operations
-
-plugin: shell
-id: piglit/glsl-fragment-shader
-requires:
- package.name == 'piglit'
-command: piglit_test -t ^shaders/glsl-arb-fragment -n glsl-fragment-shader
-estimated_duration: 2.700
-_description:
- Runs piglit tests for checking support for GLSL fragment shader operations
-
-plugin: shell
-id: piglit/glsl-vertex-shader
-requires:
- package.name == 'piglit'
-command: piglit_test -t ^shaders/glsl-clamp-vertex-color -t ^shaders/glsl-max-vertex-attrib -t ^shaders/glsl-novertexdata -n glsl-vertex-shader
-estimated_duration: 3.200
-_description:
- Runs piglit tests for checking support for GLSL vertex shader operations
-
-plugin: shell
-id: piglit/glx-tfp
-requires:
- package.name == 'piglit'
-command: piglit_test -t glx-tfp -n glx-tfp
-estimated_duration: 2.600
-_description:
- Runs piglit tests for checking support for texture from pixmap
-
-plugin: shell
-id: piglit/stencil_buffer
-requires:
- package.name == 'piglit'
-command: piglit_test -t glx-visuals-stencil -t readpixels-24_8 -n stencil_buffer
-estimated_duration: 30.000
-_description:
- Runs piglit_tests for checking support for stencil buffer operations
-
-plugin: shell
-id: piglit/summarize_results
-requires:
- package.name == 'piglit'
-command: [ -e $PLAINBOX_SESSION_SHARE/piglit-results ] && piglit-summary-html.py $PLAINBOX_SESSION_SHARE/piglit-summary/ `find $PLAINBOX_SESSION_SHARE/piglit-results/ -name main` && echo "Successfully summarized piglit results. They are available in $PLAINBOX_SESSION_SHARE/piglit-sumary/"
-estimated_duration: 1.380
-_description:
- Runs the piglit results summarizing tool
-
-plugin: shell
-id: piglit/tarball
-requires:
- package.name == 'piglit'
-depends: piglit/summarize_results
-command: [ -e $PLAINBOX_SESSION_SHARE/piglit-summary ] && tar cfz $PLAINBOX_SESSION_SHARE/piglit-results.tar.gz $PLAINBOX_SESSION_SHARE/piglit-summary/
-_description:
- Archives the piglit-summary directory into the piglit-results.tar.gz.
-
diff --git a/jobs/thunderbolt.pxu b/jobs/thunderbolt.pxu
new file mode 100644
index 0000000..5da10e5
--- /dev/null
+++ b/jobs/thunderbolt.pxu
@@ -0,0 +1,72 @@
+unit: manifest entry
+id: has_thunderbolt 
+_name: Thunderbolt Support 
+value-type: bool
+
+plugin: user-interact
+id: thunderbolt/insert
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_thunderbolt == 'True'
+command: removable_storage_watcher insert --timeout 40 scsi
+_summary: Storage insert detection on Thunderbolt
+_description:
+ PURPOSE:
+ This test will check if the insertion of a Thunderbolt HDD could be detected
+ STEPS:
+ 1. Click 'Test' to begin the test. This test will
+ timeout and fail if the insertion has not been detected within 40 seconds.
+ 2. Plug a Thunderbolt HDD into an available Thunderbolt port, if it's not
+ mounted automatically, please click the HDD icon to mount it.
+ VERIFICATION:
+ The verification of this test is automated. Do not change the automatically
+ selected result
+
+plugin: shell
+id: thunderbolt/storage-test
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_thunderbolt == 'True'
+depends: thunderbolt/insert
+command: removable_storage_test -s 268400000 scsi
+_summary: Storage test on Thunderbolt
+_description:
+ This is an automated test which performs read/write operations on an attached
+ Thunderbolt HDD
+
+plugin: user-interact
+id: thunderbolt/remove
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_thunderbolt == 'True'
+depends: thunderbolt/insert
+command: removable_storage_watcher remove scsi
+_summary: Storage removal detection on Thunderbolt
+_description:
+ PURPOSE:
+ This test will check the system can detect the removal of a Thunderbolt HDD
+ STEPS:
+ 1. Click 'Test' to begin the test. This test will timeout and fail if
+ the removal has not been detected within 20 seconds.
+ 2. Remove the previously attached Thunderbolt HDD from the Thunderbolt port.
+ VERIFICATION:
+ The verification of this test is automated. Do not change the automatically
+ selected result
+
+plugin: user-interact-verify
+id: thunderbolt/daisy-chain
+imports: from 2013.com.canonical.plainbox import manifest
+requires: manifest.has_thunderbolt == 'True'
+command: removable_storage_test -s 268400000 scsi
+_summary: Daisy-chain testing for Thunderbolt storage and display device
+_description:
+ PURPOSE:
+ This test will check if your system can support daisy-chaining of a storage
+ and a monitor over Thunderbolt port
+ STEPS:
+ 1. Connect your Thunderbolt monitor to your systems
+ 2. Connect and mount your Thunderbolt HDD to another Thunderbolt port of the
+ monitor (you can do this with HDD first as well)
+ 3. Click 'Test' to perform the storage test on the Thunderbolt HDD
+ VERIFICATION:
+ 1. The verification for storage is automated, please select the result combine
+ with the result for the display.
+ 2. Was the desktop displayed correctly on the Thunderbolt-connected screen?
+
diff --git a/jobs/touchscreen.txt.in b/jobs/touchscreen.txt.in
index 9d7ca4b..1069111 100644
--- a/jobs/touchscreen.txt.in
+++ b/jobs/touchscreen.txt.in
@@ -22,11 +22,11 @@ depends: touchscreen/nontouch-automated
 estimated_duration: 120.0
 _description:
 PURPOSE:
- Touchscreen manual detection of multitouch.
+ Touchscreen capability manual detection.
 STEPS:
 1. Look at the specifications for your system.
 VERIFICATION:
- Is the screen supposed to be multitouch?
+ Your screen was detected as a non touch screen. Select PASS if this is correct.
 
 plugin: manual
 id: touchscreen/tap-detect
@@ -57,7 +57,7 @@ plugin: user-interact-verify
 id: touchscreen/multitouch-zoom
 _summary: Check touchscreen pinch gesture for zoom
 depends: touchscreen/multitouch-automated
-command: qmlscene $PLAINBOX_PROVIDER_DATA/touch_zoom_test.qml 2>&1 |grep -o PASS
+command: qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_zoom_test.qml 2>&1 |grep -o PASS
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -72,7 +72,7 @@ plugin: user-interact-verify
 id: touchscreen/multitouch-rotate
 _summary: Check touchscreen pinch gesture for rotate
 depends: touchscreen/multitouch-automated
-command: qmlscene $PLAINBOX_PROVIDER_DATA/touch_rotate_test.qml 2>&1 |grep -o PASS
+command: qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_rotate_test.qml 2>&1 |grep -o PASS
 estimated_duration: 120.0
 _description:
 PURPOSE:
@@ -122,7 +122,7 @@ _description:
 Did you see the green circles around the three fingers?
 command:
 manage_compiz_plugin unityshell disable
- qmlscene $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=3 2>&1 | grep -o PASS
+ qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=3 2>&1 | grep -o PASS
 EXIT=$?
 manage_compiz_plugin unityshell enable
 exit $EXIT
@@ -141,7 +141,7 @@ _description:
 Did you see the green circles around the four fingers?
 command:
 manage_compiz_plugin unityshell disable
- qmlscene $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=4 2>&1 | grep -o PASS
+ qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml --touchpoints=4 2>&1 | grep -o PASS
 EXIT=$?
 manage_compiz_plugin unityshell enable
 exit $EXIT