test/lease-manager: Add named lease tests

[src/drm-lease-manager.git] / drm-lease-manager / test / test-drm-device.h

diff --git a/drm-lease-manager/test/test-drm-device.h b/drm-lease-manager/test/test-drm-device.h
index 1d5b683..897e0f7 100644 (file)
--- a/drm-lease-manager/test/test-drm-device.h
+++ b/drm-lease-manager/test/test-drm-device.h
@@ -30,6 +30,7 @@ struct drm_device {
                drmModeConnector *connectors;
                drmModeEncoder *encoders;
                drmModePlane *planes;
+               bool free_on_reset;
        } layout;
 
        struct {
@@ -44,6 +45,7 @@ extern struct drm_device test_device;
 bool setup_drm_test_device(int crtcs, int connectors, int encoders, int planes);
 void setup_test_device_layout(drmModeConnector *connectors,
                              drmModeEncoder *encoders, drmModePlane *planes);
+void setup_layout_simple_test_device(int connectors, int planes);
 void reset_drm_test_device(void);
 
 drmModeConnectorPtr get_connector(int fd, uint32_t id);
@@ -61,10 +63,14 @@ int create_lease(int fd, const uint32_t *objects, int num_objects, int flags,
 #define PLANE_ID(x) (test_device.plane_resources.planes[x])
 #define LESSEE_ID(x) (test_device.leases.lessee_ids[x])
 
-#define CONNECTOR(cid, eid, encs, enc_cnt)                   \
-       {                                                    \
-               .connector_id = cid, .encoder_id = eid,      \
-               .count_encoders = enc_cnt, .encoders = encs, \
+#define CONNECTOR(cid, eid, encs, enc_cnt) \
+       CONNECTOR_FULL(cid, eid, encs, enc_cnt, DRM_MODE_CONNECTOR_Unknown, cid)
+
+#define CONNECTOR_FULL(cid, eid, encs, enc_cnt, type, type_id)        \
+       {                                                             \
+               .connector_id = cid, .encoder_id = eid,               \
+               .count_encoders = enc_cnt, .encoders = encs,          \
+               .connector_type = type, .connector_type_id = type_id, \
        }
 
 #define ENCODER(eid, crtc, crtc_mask)               \