diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-08 19:11:30 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-08 19:12:03 +0000 |
| commit | 69926e3f6a9f439eaa48f0fe2abfff92df63f386 (patch) | |
| tree | be60f0132619ab70d04c85be9cfc883da9cacf6d | |
| parent | 0aed4dffb517536cff575633fa1f049bd6393184 (diff) | |
igt/gem_wait: Inject hangs again for hang-wait-*
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | tests/gem_wait.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/gem_wait.c b/tests/gem_wait.c index e67e4d1d..cdf3ae5a 100644 --- a/tests/gem_wait.c +++ b/tests/gem_wait.c @@ -120,15 +120,13 @@ static void basic(int fd, unsigned engine, unsigned flags) timeout = 120; if ((flags & HANG) == 0) { - igt_spin_batch_end(spin); + igt_spin_batch_set_timeout(spin, NSEC_PER_SEC/2); timeout = 1; } while (__gem_wait(fd, &wait) == -ETIME) igt_assert(igt_seconds_elapsed(&tv) < timeout); } else { - igt_spin_batch_set_timeout(spin, NSEC_PER_SEC); - wait.timeout_ns = NSEC_PER_SEC / 2; /* 0.5s */ igt_assert_eq(__gem_wait(fd, &wait), -ETIME); igt_assert_eq_s64(wait.timeout_ns, 0); @@ -136,6 +134,7 @@ static void basic(int fd, unsigned engine, unsigned flags) unplug(&cork); if ((flags & HANG) == 0) { + igt_spin_batch_set_timeout(spin, NSEC_PER_SEC/2); wait.timeout_ns = NSEC_PER_SEC; /* 1.0s */ igt_assert_eq(__gem_wait(fd, &wait), 0); igt_assert(wait.timeout_ns > 0); |