summaryrefslogtreecommitdiff
path: root/units/graphics
diff options
authorSylvain Pineau <sylvain.pineau@canonical.com>2018-05-16 11:18:44 +0200
committerSylvain Pineau <sylvain.pineau@canonical.com>2018-05-16 11:18:44 +0200
commit268a81fa5c7cd6505fc4f70c7bff2c795ea3a243 (patch)
tree6799cad8d84460ae85300f988610f2536a47bdb8 /units/graphics
parentace333cce05785433e001d0301a1437503dcf2ad (diff)
graphics: Look for Xorg logs in $HOME on systems where X is running as non root
Diffstat (limited to 'units/graphics')
-rw-r--r--units/graphics/jobs.pxu4
1 files changed, 2 insertions, 2 deletions
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 08bc7b3..88efe86 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -8,7 +8,7 @@ command:
source graphics_env {driver} {index}
graphics_driver
estimated_duration: 0.5
-_description: Parses Xorg.0.Log and discovers the running X driver and version for the {vendor} {product} graphics card
+_description: Parses Xorg.0.log and discovers the running X driver and version for the {vendor} {product} graphics card
_summary: Test X driver/version for {vendor} {product}
plugin: shell
@@ -205,7 +205,7 @@ _description:
plugin: shell
category_id: com.canonical.plainbox::graphics
id: graphics/VESA_drivers_not_in_use
-command: cat /var/log/Xorg.0.log | perl -e '$a=0;while(<>){$a++ if /Loading.*vesa_drv\.so/;$a-- if /Unloading.*vesa/&&$a}exit 1 if $a'
+command: cat /var/log/Xorg.0.log ~/.local/share/xorg/Xorg.0.log 2>&1 | perl -e '$a=0;while(<>){$a++ if /Loading.*vesa_drv\.so/;$a-- if /Unloading.*vesa/&&$a}exit 1 if $a'
estimated_duration: 0.011
_description: Check that VESA drivers are not in use
_summary: Test that VESA drivers are not in use