summaryrefslogtreecommitdiff
diff options
authorPo-Hsu Lin <po-hsu.lin@canonical.com>2014-07-17 14:16:38 +0000
committerDaniel Manrique <>2014-07-17 14:16:38 +0000
commitbdc207ba438e4a16efb2c7168ea69882ea400366 (patch)
tree73deb941a3f69a91c2f6bc8408dc7467030f4929
parentf5976f7f6bd8a5cded737c0a40bdb56fe2729e69 (diff)
parent6d1f860b92248bc4a9bc1a453c829bdd25a49b00 (diff)
"automatic merge by tarmac [r=roadmr][bug=][author=cypressyew]"
-rw-r--r--jobs/graphics.txt.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in
index 7df3eb7..355c164 100644
--- a/jobs/graphics.txt.in
+++ b/jobs/graphics.txt.in
@@ -145,12 +145,16 @@ command:
requires:
device.category == 'VIDEO'
package.name == 'zenity'
- command: zenity --info --text "Maximum resolution: $(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
+ command:
+ maxi=$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}');
+ now=$(xdpyinfo | grep dimension | awk '{print $2}')
+ change_text=$(test $maxi != $now && echo "\nPlease switch to the maximum resolution \nfor the upcoming graphic tests")
+ zenity --info --text "Maximum resolution: $maxi\nCurrent resolution: $now $change_text"
estimated_duration: 10.0
- _summary: Test maximum resolution for $product
+ _summary: Test maximum supported resolution for $product
_description:
PURPOSE:
- This test will verify the display is operating at its maximum supported resolution on the $product graphics card.
+ This test will verify the maximum supported resolution on the $product graphics card.
STEPS:
1. Select the $product graphics card (a reboot may be necessary)
2. Consult the system's specifications and locate the screen's maximum supported resolution.