From 21ec8c78b3b8860b59e772416b5858ed6b41554f Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 12 Sep 2011 20:56:13 +0200 Subject: [PATCH] tests: mark gen3-only tests as such ... instead of hanging the gpu. Signed-off-by: Daniel Vetter --- tests/gen3_mixed_blits.c | 5 +++++ tests/gen3_render_linear_blits.c | 5 +++++ tests/gen3_render_mixed_blits.c | 5 +++++ tests/gen3_render_tiledx_blits.c | 5 +++++ tests/gen3_render_tiledy_blits.c | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c index 90a61a82..28c15419 100644 --- a/tests/gen3_mixed_blits.c +++ b/tests/gen3_mixed_blits.c @@ -546,6 +546,11 @@ int main(int argc, char **argv) fd = drm_open_any(); + if (!IS_GEN3(intel_get_drm_devid(fd))) { + printf("gen3-only test, doing nothing\n"); + return 0; + } + count = 0; if (argc > 1) count = atoi(argv[1]); diff --git a/tests/gen3_render_linear_blits.c b/tests/gen3_render_linear_blits.c index 2d5e26e4..a4d8e2b0 100644 --- a/tests/gen3_render_linear_blits.c +++ b/tests/gen3_render_linear_blits.c @@ -394,6 +394,11 @@ int main(int argc, char **argv) fd = drm_open_any(); + if (!IS_GEN3(intel_get_drm_devid(fd))) { + printf("gen3-only test, doing nothing\n"); + return 0; + } + count = 0; if (argc > 1) count = atoi(argv[1]); diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c index fb38f2e7..dce8b98b 100644 --- a/tests/gen3_render_mixed_blits.c +++ b/tests/gen3_render_mixed_blits.c @@ -435,6 +435,11 @@ int main(int argc, char **argv) fd = drm_open_any(); + if (!IS_GEN3(intel_get_drm_devid(fd))) { + printf("gen3-only test, doing nothing\n"); + return 0; + } + count = 0; if (argc > 1) count = atoi(argv[1]); diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c index cd193241..7c44607f 100644 --- a/tests/gen3_render_tiledx_blits.c +++ b/tests/gen3_render_tiledx_blits.c @@ -422,6 +422,11 @@ int main(int argc, char **argv) fd = drm_open_any(); + if (!IS_GEN3(intel_get_drm_devid(fd))) { + printf("gen3-only test, doing nothing\n"); + return 0; + } + count = 0; if (argc > 1) count = atoi(argv[1]); diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c index fa2079ae..43a53b65 100644 --- a/tests/gen3_render_tiledy_blits.c +++ b/tests/gen3_render_tiledy_blits.c @@ -422,6 +422,11 @@ int main(int argc, char **argv) fd = drm_open_any(); + if (!IS_GEN3(intel_get_drm_devid(fd))) { + printf("gen3-only test, doing nothing\n"); + return 0; + } + count = 0; if (argc > 1) count = atoi(argv[1]);