[igt-dev] [PATCH i-g-t 2/3] tests/kms_mmap_write_crc: Fix igt_fixture handling

Daniel Vetter
2019-02-20T14:24:58Z

igt_fixture within an igt_simple_test don't really work as advertised.

Minimal fix, the testcase seems fairly questionable already ...

References: https://intel-gfx-ci.01.org/tree/drm-tip/drmtip_222/fi-icl-y/igt@kms_mmap_write_crc.html
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
tests/kms_mmap_write_crc.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/kms_mmap_write_crc.c b/tests/kms_mmap_write_crc.c
index 93c96ef4de08..bf2b0c2991b3 100644
--- a/tests/kms_mmap_write_crc.c
+++ b/tests/kms_mmap_write_crc.c
@@ -268,7 +268,8 @@ static data_t data;
int main(int argc, char **argv)
{
int i;
- igt_simple_init_parse_opts(&argc, argv, "n", NULL, NULL, opt_handler, NULL);
+ igt_subtest_init_parse_opts(&argc, argv, "n", NULL, NULL,
+ opt_handler, NULL);

igt_skip_on_simulation();

@@ -286,10 +287,12 @@ int main(int argc, char **argv)
fork_cpuhog_helper();
}

- igt_info("Using %d rounds for the test\n", ROUNDS);
+ igt_subtest("main") {
+ igt_info("Using %d rounds for the test\n", ROUNDS);

- for (i = 0; i < ROUNDS; i++)
- run_test(&data);
+ for (i = 0; i < ROUNDS; i++)
+ run_test(&data);
+ }

igt_fixture {
igt_display_fini(&data.display);
--
2.20.1