diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2019-10-08 14:54:38 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2019-10-08 14:54:38 +0200 |
| commit | e4752926de684dff9d28d91449a17156988a8712 (patch) | |
| tree | 7c34aeb9c15190c09f26d2e8742743747f623697 /units/suspend | |
| parent | 26cc8a96b718ffde13d57965279f6869a3adf710 (diff) | |
graphics: Rename compiz_check to gl_support
/usr/lib/nux/unity_support_test is only called with -p and no longer with -c thus checking only the OpenGL support. Fixes: lp:1832171
Diffstat (limited to 'units/suspend')
| -rw-r--r-- | units/suspend/suspend-graphics.pxu | 8 | ||||
| -rw-r--r-- | units/suspend/suspend.pxu | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu index d4fe923..21effcc 100644 --- a/units/suspend/suspend-graphics.pxu +++ b/units/suspend/suspend-graphics.pxu @@ -115,7 +115,7 @@ template-filter: graphics_card.prime_gpu_offload == 'Off' template-engine: jinja2 plugin: shell category_id: com.canonical.plainbox::suspend -id: suspend/{{ index }}_compiz_check_after_suspend_{{ product_slug }}_auto +id: suspend/{{ index }}_gl_support_after_suspend_{{ product_slug }}_auto depends: {%- if gpu_count > "1" %} suspend/{{ index }}_suspend_after_switch_to_card_{{ product_slug }}_auto @@ -125,10 +125,10 @@ depends: requires: package.name == 'nux-tools' command: source graphics_env {{ driver }} {{ index }} - ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error" + ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error" estimated_duration: 0.130 -_description: Check that {{ product }} hardware is able to run compiz after suspend -_summary: Test Compiz support for {{ product }} after suspend +_description: Check that {{ product }} hardware is able to run a desktop session (OpenGL) +_summary: Test OpenGL support for {{ product }} after suspend unit: template template-resource: graphics_card diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index 35ba417..5d9bf08 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -2120,23 +2120,23 @@ template-resource: graphics_card template-filter: graphics_card.prime_gpu_offload == 'Off' plugin: shell category_id: com.canonical.plainbox::suspend -id: suspend/{index}_compiz_check_after_suspend_{product_slug} +id: suspend/{index}_gl_support_after_suspend_{product_slug} depends: suspend/{index}_suspend_after_switch_to_card_{product_slug} requires: package.name == 'nux-tools' -command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error" +command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error" estimated_duration: 0.130 -_description: Check that {product} hardware is able to run compiz after suspend -_summary: Test Compiz support for {product} after suspend +_description: Check that {product} hardware is able to run a desktop session (OpenGL) after suspend +_summary: Test OpenGL support for {product} after suspend plugin: shell category_id: com.canonical.plainbox::suspend -id: suspend/compiz_check_after_suspend +id: suspend/gl_support_after_suspend depends: suspend/suspend_advanced requires: package.name == 'nux-tools' -command: ! /usr/lib/nux/unity_support_test -c -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error" +command: ! /usr/lib/nux/unity_support_test -p 2>&1 | ansi_parser | grep -e ":\(\s\+\)no$" -ie "error" estimated_duration: 0.130 -_description: Check that the hardware is able to run compiz after suspend -_summary: Test Compiz support after suspend +_description: Check that the hardware is able to run a desktop session (OpenGL) +_summary: Test OpenGL support after suspend unit: template template-resource: graphics_card |