summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-04 18:11:37 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-04 18:12:39 +0200
commit54b5f7251ac8f28338ea59f110f680c3ac8b6c74 (patch)
tree5e846866cb5a592bd7a56cb71966a85c6ec74664
parent47d0a6fa6954a2742a50b988461f48597f960b24 (diff)
tests/kms_flip: check flip count in both directions
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--tests/kms_flip.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index c8e64141..90392126 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -544,12 +544,9 @@ static void check_state_correlation(struct test_output *o,
ftime = frame_time(o);
usec_diff -= seq_diff * ftime;
- if (fabs(usec_diff) / ftime > 0.005) {
- fprintf(stderr,
- "timestamp mismatch between %s and %s (diff %.4f sec)\n",
- es1->name, es2->name, usec_diff / 1000 / 1000);
- igt_fail(14);
- }
+ igt_assert_f(fabs(usec_diff) / ftime <= 0.005,
+ "timestamp mismatch between %s and %s (diff %.4f sec)\n",
+ es1->name, es2->name, usec_diff / 1000 / 1000);
}
static void check_all_state(struct test_output *o,
@@ -1062,11 +1059,9 @@ static void check_final_state(struct test_output *o, struct event_state *es,
count *= es->seq_step;
expected = elapsed * o->kmode[0].vrefresh / (1000 * 1000);
- if (count < expected * 99/100) {
- fprintf(stderr, "dropped frames, expected %d, counted %d, encoder type %d\n",
- expected, count, o->kencoder[0]->encoder_type);
- igt_fail(3);
- }
+ igt_assert_f(count >= expected * 99/100 && count <= expected * 101/100,
+ "dropped frames, expected %d, counted %d, encoder type %d\n",
+ expected, count, o->kencoder[0]->encoder_type);
}
}