flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-25 16:56:35 +00:00
Code Issues Releases Wiki Activity

test/flip_test: fail harder

Browse Source 
We want testcase to return non-zero if they fail ...
This commit is contained in:
Daniel Vetter 2012-05-22 19:54:22 +02:00
parent 17787f30c6
commit 96c2fc82ba
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/flip_test.c
View File

@ -89,12 +89,7 @@ static void connector_find_preferred_mode(struct test_output *o, int crtc_id)
o->mode_valid = 0; o->mode_valid = 0;
o->crtc = 0; o->crtc = 0;
connector = drmModeGetConnector(drm_fd, o->id); connector = drmModeGetConnector(drm_fd, o->id);
if (!connector) { assert(connector);
fprintf(stderr, "could not get connector %d: %s\n",
o->id, strerror(errno));
drmModeFreeConnector(connector);
return;
}
if (connector->connection != DRM_MODE_CONNECTED) { if (connector->connection != DRM_MODE_CONNECTED) {
drmModeFreeConnector(connector); drmModeFreeConnector(connector);
@ -216,8 +211,7 @@ static void set_mode(struct test_output *o, int crtc)
paint_flip_mode, (void *)true); paint_flip_mode, (void *)true);
if (!o->fb_ids[0] || !o->fb_ids[1]) { if (!o->fb_ids[0] || !o->fb_ids[1]) {
fprintf(stderr, "failed to create fbs\n"); fprintf(stderr, "failed to create fbs\n");
ret = -1; exit(3);
goto out;
} }
gem_close(drm_fd, fb_info[0].gem_handle); gem_close(drm_fd, fb_info[0].gem_handle);
@ -229,15 +223,14 @@ static void set_mode(struct test_output *o, int crtc)
fprintf(stderr, "failed to set mode (%dx%d@%dHz): %s\n", fprintf(stderr, "failed to set mode (%dx%d@%dHz): %s\n",
width, height, o->mode.vrefresh, width, height, o->mode.vrefresh,
strerror(errno)); strerror(errno));
ret = -1; exit(3);
goto out;
} }
ret = drmModePageFlip(drm_fd, o->crtc, o->fb_ids[1], ret = drmModePageFlip(drm_fd, o->crtc, o->fb_ids[1],
DRM_MODE_PAGE_FLIP_EVENT, o); DRM_MODE_PAGE_FLIP_EVENT, o);
if (ret) { if (ret) {
fprintf(stderr, "failed to page flip: %s\n", strerror(errno)); fprintf(stderr, "failed to page flip: %s\n", strerror(errno));
goto out; exit(4);
} }
o->current_fb_id = o->fb_ids[1]; o->current_fb_id = o->fb_ids[1];
@ -261,10 +254,10 @@ static void set_mode(struct test_output *o, int crtc)
if (ret <= 0) { if (ret <= 0) {
fprintf(stderr, "select timed out or error (ret %d)\n", fprintf(stderr, "select timed out or error (ret %d)\n",
ret); ret);
continue; exit(1);
} else if (FD_ISSET(0, &fds)) { } else if (FD_ISSET(0, &fds)) {
fprintf(stderr, "no fds active, breaking\n"); fprintf(stderr, "no fds active, breaking\n");
break; exit(2);
} }
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
@ -278,8 +271,8 @@ static void set_mode(struct test_output *o, int crtc)
} }
out: out:
fprintf(stdout, "page flipping on crtc %d, connector %d: %s\n", crtc, fprintf(stdout, "page flipping on crtc %d, connector %d: PASSED\n",
o->id, ret ? "FAILED" : "PASSED"); crtc, o->id);
drmModeFreeEncoder(o->encoder); drmModeFreeEncoder(o->encoder);
drmModeFreeConnector(o->connector); drmModeFreeConnector(o->connector);
@ -294,13 +287,12 @@ static int run_test(void)
if (!resources) { if (!resources) {
fprintf(stderr, "drmModeGetResources failed: %s\n", fprintf(stderr, "drmModeGetResources failed: %s\n",
strerror(errno)); strerror(errno));
return 0; exit(5);
} }
connectors = calloc(resources->count_connectors, connectors = calloc(resources->count_connectors,
sizeof(struct test_output)); sizeof(struct test_output));
if (!connectors) assert(connectors);
return 0;
/* Find any connected displays */ /* Find any connected displays */
for (c = 0; c < resources->count_connectors; c++) { for (c = 0; c < resources->count_connectors; c++) {