units: Use the executable resource for glxgears/glxinfo/qmlscene/wmctrl

4 files changed, 20 insertions, 20 deletions

diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 261a527..80f509b 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -87,7 +87,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_screen_resolution_{product_slug}
 requires:
 device.category == 'VIDEO'
- package.name == 'qmlscene'
+ executable.name == 'qmlscene'
 command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10.0
 _summary: Test default resolution for {vendor} {product}
@@ -283,7 +283,7 @@ template-filter: graphics_card.driver in ['amdgpu', 'amdgpu-pro']
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_valid_opengl_renderer_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxinfo'
 command:
 renderer=`DRI_PRIME=1 glxinfo | grep "OpenGL re"`
 echo $renderer
@@ -298,7 +298,7 @@ template-resource: graphics_card
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_glxgears_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command:
 source graphics_env {driver} {index}
 glxgears
@@ -319,7 +319,7 @@ template-resource: graphics_card
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_glxgears_fullscreen_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command:
 source graphics_env {driver} {index}
 glxgears -fullscreen
@@ -340,7 +340,7 @@ template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_open_close_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close -i 10
 estimated_duration: 60.525
 _description: Open and close a 3D window multiple times on the {vendor} {product} video card
@@ -351,7 +351,7 @@ template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_suspend_resume_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t suspend-resume -i 10
 estimated_duration: 121.00
 _description: Open, suspend resume and close a 3D window multiple times on the {vendor} {product} video card
@@ -362,7 +362,7 @@ template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_multi_3d_windows_open_close_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close-multi -i 10 -w 4
 estimated_duration: 60.000
 _description: Open and close 4 3D windows multiple times on the {vendor} {product} video card
@@ -374,8 +374,8 @@ plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_move_{product_slug}
 requires:
- package.name == 'mesa-utils'
- package.name == 'wmctrl'
+ executable.name == 'glxgears'
+ executable.name == 'wmctrl'
 command: window_test -t move
 estimated_duration: 50.000
 _description: Move a 3D window around the screen on the {vendor} {product} video card
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 5e8fe82..74153cc 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -47,7 +47,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/screen-resolution
 requires:
 device.category == 'VIDEO'
- package.name == 'qmlscene'
+ executable.name == 'qmlscene'
 command: qmlscene -qt5 --transparent --fullscreen $PLAINBOX_PROVIDER_DATA/resolution_test.qml
 estimated_duration: 10.0
 _summary: Test default resolution
@@ -174,7 +174,7 @@ _summary: Test Unity 3D support
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::graphics
 id: graphics/glxgears
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: glxgears; true
 _summary: Test that glxgears works
 _description:
@@ -190,7 +190,7 @@ _description:
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/3d_window_open_close
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close -i 10
 estimated_duration: 60.525
 _summary: Test 3D window open/close
@@ -199,7 +199,7 @@ _description: Open and close a 3D window multiple times
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/3d_window_suspend_resume
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t suspend-resume -i 10
 estimated_duration: 121.00
 _description: Open, suspend resume and close a 3D window multiple times
@@ -208,7 +208,7 @@ _summary: Test a 3D window with suspend/resume
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/multi_3d_windows_open_close
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t open-close-multi -i 10 -w 4
 estimated_duration: 60.000
 _description: Open and close 4 3D windows multiple times
@@ -217,7 +217,7 @@ _summary: Test Multi 3D window open/close
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/3d_window_move
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: window_test -t move
 estimated_duration: 50.000
 _description: Move a 3D window around the screen
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index e05153a..849e5eb 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -126,7 +126,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_glxgears_after_suspend_{product_slug}_xenial
 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}_xenial
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command:
 source graphics_env {driver} {index}
 glxgears
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index a862390..34d1957 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -1232,8 +1232,8 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/gpu_lockup_after_suspend
 estimated_duration: 10.0
 requires:
- package.name == 'wmctrl'
- package.name == 'mesa-utils'
+ executable.name == 'wmctrl'
+ executable.name == 'glxgears'
 package.name == 'firefox'
 package.name == 'unity'
 depends: suspend/suspend_advanced_auto
@@ -2197,7 +2197,7 @@ plugin: user-interact-verify
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_glxgears_after_suspend_{product_slug}
 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
-requires: package.name == 'mesa-utils'
+requires: executable.name == 'glxgears'
 command: glxgears; true
 _summary: Test that glxgears works for {vendor} {product} after suspend
 _description:
@@ -2215,7 +2215,7 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/glxgears_after_suspend
 depends: suspend/suspend_advanced
 requires:
- package.name == 'mesa-utils'
+ executable.name == 'glxgears'
 device.category == 'VIDEO'
 command: glxgears; true
 _summary: Test that glxgears works after suspend