diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2014-02-12 15:54:27 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-02-12 17:45:10 +0100 |
| commit | a2bf80fd8462b0014f2e230421173677bbb8b742 (patch) | |
| tree | 65b54bc79f82b19adc1ec7250405a866adec8daf | |
| parent | ec3b1332f87e956e7de8e03e2cdbb962df05e214 (diff) | |
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>
| -rw-r--r-- | tests/gem_evict_alignment.c | 7 | ||||
| -rw-r--r-- | tests/gem_pwrite_pread.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/gem_evict_alignment.c b/tests/gem_evict_alignment.c index 15c4707d..c478f18e 100644 --- a/tests/gem_evict_alignment.c +++ b/tests/gem_evict_alignment.c @@ -189,11 +189,12 @@ igt_main igt_skip_on_simulation(); - igt_fixture + igt_fixture { fd = drm_open_any(); - igt_skip_on_f(intel_gen(intel_get_drm_devid(fd)) > 7, - "BLIT commands not yet updated\n"); + igt_skip_on_f(intel_gen(intel_get_drm_devid(fd)) > 7, + "BLIT commands not yet updated\n"); + } igt_subtest("minor-normal") { size = 1024 * 1024; diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c index 1ae08208..8f768b3c 100644 --- a/tests/gem_pwrite_pread.c +++ b/tests/gem_pwrite_pread.c @@ -380,9 +380,9 @@ int main(int argc, char **argv) gem_set_caching(fd, src, 0); gem_set_caching(fd, dst, 0); - } - devid = intel_get_drm_devid(fd); + devid = intel_get_drm_devid(fd); + } igt_subtest("uncached-copy-correctness") test_copy(fd, src, dst, tmp, object_size); |