drm: Branch 'master'

 tests/drmdevice.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e642f480b816f21448fc616f6122df5e8a6070fa
Author: Eric Engestrom <[email protected]>
Date:   Fri Nov 9 19:00:35 2018 +0000

    tests: skip drmdevice test if the machine doesn't have any drm device
    
    Error message was invalid too, negative values aren't the number of
    devices, they're errno error codes.
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Daniel Stone <[email protected]>

diff --git a/tests/drmdevice.c b/tests/drmdevice.c
index cdf6e8de..f1c1cd3a 100644
--- a/tests/drmdevice.c
+++ b/tests/drmdevice.c
@@ -115,8 +115,9 @@ main(void)
     max_devices = drmGetDevices2(0, NULL, 0);
 
     if (max_devices <= 0) {
-        printf("drmGetDevices2() has returned %d\n", max_devices);
-        return -1;
+        printf("drmGetDevices2() has not found any devices (errno=%d)\n",
+               -max_devices);
+        return 77;
     }
     printf("--- Devices reported %d ---\n", max_devices);
 


--