drmtest: make check should fail so hard on unable to open device

main
Dave Airlie 2011-09-26 16:03:20 +01:00
parent 3a551c1274
commit c82ef03e4c
1 changed files with 7 additions and 4 deletions

View File

@ -62,7 +62,7 @@ int drm_open_matching(const char *pci_glob, int flags)
struct udev_device *device, *parent;
struct udev_list_entry *entry;
const char *pci_id, *path;
const char *usub;
const char *usub, *dnode;
int fd;
udev = udev_new();
@ -86,7 +86,10 @@ int drm_open_matching(const char *pci_glob, int flags)
pci_id = udev_device_get_property_value(parent, "PCI_ID");
if (fnmatch(pci_glob, pci_id, 0) != 0)
continue;
fd = open(udev_device_get_devnode(device), O_RDWR);
dnode = udev_device_get_devnode(device);
if (strstr(dnode, "control"))
continue;
fd = open(dnode, O_RDWR);
if (fd < 0)
continue;
if ((flags & DRM_TEST_MASTER) && !is_master(fd)) {
@ -109,7 +112,7 @@ int drm_open_any(void)
if (fd < 0) {
fprintf(stderr, "failed to open any drm device\n");
abort();
exit(0);
}
return fd;
@ -124,7 +127,7 @@ int drm_open_any_master(void)
if (fd < 0) {
fprintf(stderr, "failed to open any drm device\n");
abort();
exit(0);
}
return fd;