flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-24 18:35:58 +00:00
Code Issues Releases Wiki Activity

tests/gem_reset_stats: Correctly wrap global test code

Browse Source 
Tests _must_ be able to run as non-root and on non-intel platforms,
otherwise the enumeration is busted (since QA enumerates testcases on
a gpu-less xeon box).

Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-02-11 12:04:57 +01:00
parent 971c7db2c8
commit a6bc3d91af
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/gem_reset_stats.c
View File

@ -1020,6 +1020,8 @@ static void test_params(void)
#define RING_HAS_CONTEXTS current_ring->contexts(current_ring) #define RING_HAS_CONTEXTS current_ring->contexts(current_ring)
#define RUN_CTX_TEST(...) do { igt_skip_on(RING_HAS_CONTEXTS == false); __VA_ARGS__; } while (0) #define RUN_CTX_TEST(...) do { igt_skip_on(RING_HAS_CONTEXTS == false); __VA_ARGS__; } while (0)
int fd;
igt_main igt_main
{ {
struct local_drm_i915_gem_context_create create; struct local_drm_i915_gem_context_create create;
@ -1029,7 +1031,6 @@ igt_main
igt_skip_on_simulation(); igt_skip_on_simulation();
igt_fixture { igt_fixture {
int fd;
fd = drm_open_any(); fd = drm_open_any();
devid = intel_get_drm_devid(fd); devid = intel_get_drm_devid(fd);
igt_require_f(intel_gen(devid) >= 4, igt_require_f(intel_gen(devid) >= 4,
@ -1041,8 +1042,6 @@ igt_main
strerror(errno)); strerror(errno));
assert(igt_debugfs_init(&dfs) == 0); assert(igt_debugfs_init(&dfs) == 0);
close(fd);
} }
igt_subtest("params") igt_subtest("params")
@ -1050,13 +1049,12 @@ igt_main
for (int i = 0; i < NUM_RINGS; i++) { for (int i = 0; i < NUM_RINGS; i++) {
const char *name; const char *name;
int fd;
current_ring = &rings[i]; current_ring = &rings[i];
name = current_ring->name; name = current_ring->name;
fd = drm_open_any(); igt_fixture
gem_require_ring(fd, current_ring->exec); gem_require_ring(fd, current_ring->exec);
igt_subtest_f("reset-stats-%s", name) igt_subtest_f("reset-stats-%s", name)
test_rs(4, 1, 0); test_rs(4, 1, 0);
@ -1094,4 +1092,7 @@ igt_main
test_close_pending_fork(false); test_close_pending_fork(false);
} }
} }
igt_fixture
close(fd);
} }