From 0d3c8a5fbb4d4c2246c1ed8f31b4754f5f9a6ca4 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Fri, 13 Oct 2017 14:59:55 +0300 Subject: tests: Clean up igt_skip_on_simulation() uses General update to reflect current state of things. Signed-off-by: Arkadiusz Hiler Acked-by: Radoslaw Szwichtenberg Acked-by: Petri Latvala --- tests/prime_busy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/prime_busy.c') diff --git a/tests/prime_busy.c b/tests/prime_busy.c index a516ab86..a82acbdb 100644 --- a/tests/prime_busy.c +++ b/tests/prime_busy.c @@ -186,9 +186,14 @@ static void test_engine_mode(int fd, igt_require(gem_can_store_dword(fd, e->exec_id | e->flags)); if ((flags & HANG) == 0) + { igt_fork_hang_detector(fd); + } else + { + igt_skip_on_simulation(); hang = igt_allow_hang(fd, 0, 0); + } } igt_subtest_f("%s%s-%s", @@ -215,8 +220,6 @@ igt_main const struct intel_execution_engine *e; int fd = -1; - igt_skip_on_simulation(); - igt_fixture { fd = drm_open_driver_master(DRIVER_INTEL); igt_require_gem(fd); -- cgit v1.2.3