diff mbox

[i-g-t] tests/gem_exec_reloc: Don't call igt_(dis)allow_hang outside fixtures

Message ID 1486379098-2127-1-git-send-email-petri.latvala@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Petri Latvala Feb. 6, 2017, 11:04 a.m. UTC 
gem_exec_reloc --list-subtests breaks otherwise.

v2: use igt_subtest_group (Chris)

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

Comments

Chris Wilson Feb. 6, 2017, 11:14 a.m. UTC | #1 
On Mon, Feb 06, 2017 at 01:04:58PM +0200, Petri Latvala wrote:
> gem_exec_reloc --list-subtests breaks otherwise.
> 
> v2: use igt_subtest_group (Chris)
> 
> CC: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>

Lgtm, thanks.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
diff mbox

Patch

diff --git a/tests/gem_exec_reloc.c b/tests/gem_exec_reloc.c
index 78bb59c..8356d85 100644
--- a/tests/gem_exec_reloc.c
+++ b/tests/gem_exec_reloc.c
@@ -550,19 +550,25 @@  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)
-				basic_reloc(fd, m->before, m->after, f->flags);
+		igt_subtest_group {
+			igt_fixture {
+				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)
+					basic_reloc(fd, m->before, m->after, f->flags);
+			}
+
+			igt_fixture {
+				if (f->flags & HANG)
+					igt_disallow_hang(fd, hang);
+			}
 		}
-
-		if (f->flags & HANG)
-			igt_disallow_hang(fd, hang);
 	}
 
 	igt_subtest("basic-softpin")