diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2014-10-15 12:10:13 +0100 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2014-10-17 15:34:44 +0100 |
| commit | 06de0e7f297d3f0e7747edea6252201ff43846b9 (patch) | |
| tree | 30d427e908f7f74250f6b450d03c5ee3549669d0 /tests | |
| parent | 1a0ae51f512860e89a7a5978d76a8c280e9324eb (diff) | |
tests/kms_force_connector: fix assertion when VGA is already connected
Compare the number of modes available when the edid is reset with the
number before the edid was overridden.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82230
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kms_force_connector.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/kms_force_connector.c b/tests/kms_force_connector.c index a6c4ce39..34c33b04 100644 --- a/tests/kms_force_connector.c +++ b/tests/kms_force_connector.c @@ -35,6 +35,7 @@ main (int argc, char **argv) drmModeRes *res; drmModeConnector *vga_connector, *temp; igt_display_t display; + int start_n_modes; igt_simple_init(argc, argv); @@ -61,6 +62,7 @@ main (int argc, char **argv) temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); igt_assert(temp->connection == DRM_MODE_CONNECTED); igt_assert(temp->count_modes > 0); + start_n_modes = temp->count_modes; drmModeFreeConnector(temp); /* attempt to use the display */ @@ -96,8 +98,9 @@ main (int argc, char **argv) /* remove edid */ kmstest_force_edid(drm_fd, vga_connector, NULL, 0); temp = drmModeGetConnector(drm_fd, vga_connector->connector_id); - /* the connector should now have the 5 default modes */ - igt_assert(temp->count_modes == 5); + /* the connector should now have the same number of modes that it + * started with */ + igt_assert(temp->count_modes == start_n_modes); drmModeFreeConnector(temp); /* force the connector off */ |