[Intel-gfx] [PATCH i-g-t] tests/gem_exec_reloc: Call igt_(dis)allow_hang inside subtest block

Petri Latvala petri.latvala at intel.com
Mon Feb 6 10:16:01 UTC 2017


gem_exec_reloc --list-subtests breaks otherwise.

CC: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Petri Latvala <petri.latvala at intel.com>
---
 tests/gem_exec_reloc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/gem_exec_reloc.c b/tests/gem_exec_reloc.c
index 78bb59c..012abc2 100644
--- a/tests/gem_exec_reloc.c
+++ b/tests/gem_exec_reloc.c
@@ -550,19 +550,20 @@ igt_main
 	for (f = flags; f->name; f++) {
 		igt_hang_t hang;
 
-		if (f->flags & HANG)
-			hang = igt_allow_hang(fd, 0, 0);
-
 		for (m = modes; m->name; m++) {
 			igt_subtest_f("%s%s%s",
 				      f->basic ? "basic-" : "",
 				      m->name,
-				      f->name)
+				      f->name) {
+				if (f->flags & HANG)
+					hang = igt_allow_hang(fd, 0, 0);
+
 				basic_reloc(fd, m->before, m->after, f->flags);
-		}
 
-		if (f->flags & HANG)
-			igt_disallow_hang(fd, hang);
+				if (f->flags & HANG)
+					igt_disallow_hang(fd, hang);
+			}
+		}
 	}
 
 	igt_subtest("basic-softpin")
-- 
2.9.3



More information about the Intel-gfx mailing list