mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-20 08:10:11 +01:00
drmtest: make check should fail so hard on unable to open device
This commit is contained in:
parent
3a551c1274
commit
c82ef03e4c
1 changed files with 7 additions and 4 deletions
|
|
@ -62,7 +62,7 @@ int drm_open_matching(const char *pci_glob, int flags)
|
||||||
struct udev_device *device, *parent;
|
struct udev_device *device, *parent;
|
||||||
struct udev_list_entry *entry;
|
struct udev_list_entry *entry;
|
||||||
const char *pci_id, *path;
|
const char *pci_id, *path;
|
||||||
const char *usub;
|
const char *usub, *dnode;
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
udev = udev_new();
|
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");
|
pci_id = udev_device_get_property_value(parent, "PCI_ID");
|
||||||
if (fnmatch(pci_glob, pci_id, 0) != 0)
|
if (fnmatch(pci_glob, pci_id, 0) != 0)
|
||||||
continue;
|
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)
|
if (fd < 0)
|
||||||
continue;
|
continue;
|
||||||
if ((flags & DRM_TEST_MASTER) && !is_master(fd)) {
|
if ((flags & DRM_TEST_MASTER) && !is_master(fd)) {
|
||||||
|
|
@ -109,7 +112,7 @@ int drm_open_any(void)
|
||||||
|
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
fprintf(stderr, "failed to open any drm device\n");
|
fprintf(stderr, "failed to open any drm device\n");
|
||||||
abort();
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
|
|
@ -124,7 +127,7 @@ int drm_open_any_master(void)
|
||||||
|
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
fprintf(stderr, "failed to open any drm device\n");
|
fprintf(stderr, "failed to open any drm device\n");
|
||||||
abort();
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue