summaryrefslogtreecommitdiff
path: root/jobs
diff options
authorTaihsiang Ho <taihsiang.ho@canonical.com>2016-05-13 10:02:14 +0000
committerSylvain Pineau <>2016-05-13 10:02:14 +0000
commit7f51e98fa81404609771a340e5956e551bfb7358 (patch)
tree9fe3b4c8d2d58c43065cb4c5a6ed76763cbc6c42 /jobs
parente487d1fd8a8bcf2ee78f24aad299d6a3c75374d8 (diff)
parentd2b9dad7534593f3698d0c81bd87e938bb36c578 (diff)
"automatic merge of lp:~taihsiangho/checkbox/fix1578136-camera-test-failed-resurrect-for-precise/ by tarmac [r=sylvain-pineau][bug=1578136][author=taihsiangho]"
Diffstat (limited to 'jobs')
-rw-r--r--jobs/camera.txt.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/jobs/camera.txt.in b/jobs/camera.txt.in
index bff0dc6..a937749 100644
--- a/jobs/camera.txt.in
+++ b/jobs/camera.txt.in
@@ -8,7 +8,7 @@ id: camera/detect
estimated_duration: 1.2
requires:
device.category == 'CAPTURE'
-command: camera_test detect
+command: if [ "`lsb_release -c | awk {'print $2'}`" == "precise" ]; then camera_test_legacy detect; else camera_test detect; fi
_description: This Automated test attempts to detect a camera.
plugin: user-interact-verify
@@ -18,7 +18,7 @@ estimated_duration: 120.0
depends: camera/detect
requires:
device.category == 'CAPTURE'
-command: camera_test display
+command: if [ "`lsb_release -c | awk {'print $2'}`" == "precise" ]; then camera_test_legacy display; else camera_test display; fi
_description:
PURPOSE:
This test will check that the built-in camera works
@@ -37,7 +37,7 @@ requires:
package.name == 'eog'
package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
device.category == 'CAPTURE'
-command: camera_test still
+command: if [ "`lsb_release -c | awk {'print $2'}`" == "precise" ]; then camera_test_legacy still; else camera_test still; fi
_description:
PURPOSE:
This test will check that the built-in camera works
@@ -54,7 +54,7 @@ depends: camera/detect
requires:
package.name == 'fswebcam' or package.name == 'gir1.2-gst-plugins-base-0.10' or package.name == 'gir1.2-gst-plugins-base-1.0'
device.category == 'CAPTURE'
-command: camera_test resolutions
+command: if [ "`lsb_release -c | awk {'print $2'}`" == "precise" ]; then camera_test_legacy resolutions; else camera_test resolutions; fi
_description:
Takes multiple pictures based on the resolutions supported by the camera and
validates their size and that they are of a valid format.