diff options
| author | Ubuntu <ubuntu@cert-jenkins-slave-1-201406-15260.maas> | 2022-06-15 17:25:47 +0000 |
|---|---|---|
| committer | Ubuntu <ubuntu@cert-jenkins-slave-1-201406-15260.maas> | 2022-06-15 17:25:47 +0000 |
| commit | 91478e881f1672cb9c9a3f68fd7b2d31b6602b07 (patch) | |
| tree | 04070515cb7f058368e84209477f85fb73a62be8 /units/graphics | |
| parent | e25b1973fc78bb10c8a709362ae7d5932769a1d0 (diff) | |
| parent | a028a44bb18f0f2e9e26c91c3e7f216c70911509 (diff) | |
Merge #424146 from ~pieq/plainbox-provider-checkbox:1968943-rework-max-resolution-job
Diffstat (limited to 'units/graphics')
| -rw-r--r-- | units/graphics/jobs.pxu | 18 | ||||
| -rw-r--r-- | units/graphics/legacy.pxu | 8 |
2 files changed, 1 insertions, 25 deletions
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu index 4dde304..8206f1a 100644 --- a/units/graphics/jobs.pxu +++ b/units/graphics/jobs.pxu @@ -133,13 +133,7 @@ category_id: com.canonical.plainbox::graphics requires: device.category == 'VIDEO' command: - # shellcheck disable=SC1091 - source graphics_env.sh {driver} {index} - maxi="$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{{print $1}}')" - now="$(python3 -c 'from gi.repository import Gdk; screen=Gdk.Screen.get_default(); geo = screen.get_monitor_geometry(screen.get_primary_monitor()); print(geo.width, "x", geo.height, sep="")')" - test "$maxi" != "$now" && notify="\nPlease switch to the maximum resolution \nfor every graphic tests" - echo "Maximum resolution: $maxi" - echo "Current resolution: $now $notify" + graphics_max_resolution.py estimated_duration: 10.0 _summary: Test maximum supported resolution for {vendor} {product} _description: @@ -154,16 +148,6 @@ _description: unit: template template-resource: graphics_card -id: graphics/{index}_modes_{product_slug} -plugin: shell -category_id: com.canonical.plainbox::graphics -command: graphics_modes_info.py -estimated_duration: 0.250 -_description: Collect info on graphics modes (screen resolution and refresh rate) for {vendor} {product} -_summary: Test graphic modes info for {vendor} {product} - -unit: template -template-resource: graphics_card id: graphics/{index}_color_depth_{product_slug} plugin: shell category_id: com.canonical.plainbox::graphics diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu index 14969b0..2b9545d 100644 --- a/units/graphics/legacy.pxu +++ b/units/graphics/legacy.pxu @@ -96,14 +96,6 @@ _description: VERIFICATION: Is this the display's maximum resolution? -id: graphics/modes -plugin: shell -category_id: com.canonical.plainbox::graphics -command: graphics_modes_info.py -estimated_duration: 0.250 -_description: Collect info on graphics modes (screen resolution and refresh rate) -_summary: Collect info on graphics modes - id: graphics/color_depth plugin: shell category_id: com.canonical.plainbox::graphics |