tests: fix sub-test enumeration

Ensure sub-tests can be listed correctly by doing any test setup within
an igt_fixture block.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Thomas Wood 2014-02-12 15:54:27 +00:00 committed by Daniel Vetter
parent ec3b1332f8
commit a2bf80fd84
2 changed files with 6 additions and 5 deletions

View File

@ -189,11 +189,12 @@ igt_main
igt_skip_on_simulation(); igt_skip_on_simulation();
igt_fixture igt_fixture {
fd = drm_open_any(); fd = drm_open_any();
igt_skip_on_f(intel_gen(intel_get_drm_devid(fd)) > 7, igt_skip_on_f(intel_gen(intel_get_drm_devid(fd)) > 7,
"BLIT commands not yet updated\n"); "BLIT commands not yet updated\n");
}
igt_subtest("minor-normal") { igt_subtest("minor-normal") {
size = 1024 * 1024; size = 1024 * 1024;

View File

@ -380,9 +380,9 @@ int main(int argc, char **argv)
gem_set_caching(fd, src, 0); gem_set_caching(fd, src, 0);
gem_set_caching(fd, dst, 0); gem_set_caching(fd, dst, 0);
}
devid = intel_get_drm_devid(fd); devid = intel_get_drm_devid(fd);
}
igt_subtest("uncached-copy-correctness") igt_subtest("uncached-copy-correctness")
test_copy(fd, src, dst, tmp, object_size); test_copy(fd, src, dst, tmp, object_size);