summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-17 17:29:10 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-17 17:31:19 +0100
commitff193614b29308373ff3a54266159e3e194455a2 (patch)
tree9db00971a6a128375d268a4e7df9d65eaaddbc9a
parent36786e4a04c988184d3c04984f8e4bf7276b0bb1 (diff)
tests/gem_reset_stats: Use macros a bit more
Just demonstration really. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--tests/gem_reset_stats.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c
index 20402942..07dfac42 100644
--- a/tests/gem_reset_stats.c
+++ b/tests/gem_reset_stats.c
@@ -717,7 +717,7 @@ static void test_params(void)
}
-int main(int argc, char **argv)
+igt_main
{
struct local_drm_i915_gem_context_create create;
uint32_t devid;
@@ -726,13 +726,11 @@ int main(int argc, char **argv)
igt_skip_on_simulation();
- igt_subtest_init(argc, argv);
-
igt_fixture {
fd = drm_open_any();
devid = intel_get_drm_devid(fd);
- if (intel_gen(devid) < 4)
- igt_skip("Architecture %d too old\n", intel_gen(devid));
+ igt_require_f(intel_gen(devid) >= 4,
+ "Architecture %d too old\n", intel_gen(devid));
ret = drmIoctl(fd, CONTEXT_CREATE_IOCTL, &create);
if (ret != 0 && (errno == ENODEV || errno == EINVAL))
@@ -765,6 +763,4 @@ int main(int argc, char **argv)
igt_subtest("params")
test_params();
-
- igt_exit();
}