tests/flip_test: actually try to check what I want to check
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 2 Oct 2012 13:59:58 +0000 (15:59 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 2 Oct 2012 13:59:58 +0000 (15:59 +0200)
/me sucks

tests/flip_test.c

index 1ae6f80..d8abb71 100644 (file)
@@ -70,7 +70,7 @@ struct test_output {
        unsigned int current_fb_id;
        unsigned int fb_ids[2];
        struct kmstest_fb fb_info[2];
-       struct timeval last_flip_ts;
+       struct timeval last_flip;
 };
 
 static void emit_dummy_load(struct test_output *o)
@@ -162,12 +162,12 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec,
        timersub(&pageflip_ts, &now, &diff);
 
        if (diff.tv_sec > 0 || diff.tv_usec > 2000) {
-               fprintf(stderr, "pageflip timestamp delayed for too long: %us, %uusec\n",
-                       (unsigned) diff.tv_sec, (unsigned) diff.tv_usec);
+               fprintf(stderr, "pageflip timestamp delayed for too long: %is, %iusec\n",
+                       (int) diff.tv_sec, (int) diff.tv_usec);
                exit(5);
        }
 
-       if (!timercmp(&o->last_flip_ts, &now, <)) {
+       if (!timercmp(&o->last_flip, &pageflip_ts, <)) {
                fprintf(stderr, "pageflip ts before the pageflip was issued!\n");
                exit(6);
        }
@@ -190,7 +190,7 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec,
        if (o->flags & TEST_DPMS)
                do_or_die(set_dpms(o, DRM_MODE_DPMS_OFF));
 
-       o->last_flip_ts = now;
+       o->last_flip = now;
 }
 
 static void connector_find_preferred_mode(struct test_output *o, int crtc_id)
@@ -366,7 +366,7 @@ static void flip_mode(struct test_output *o, int crtc, int duration)
        evctx.page_flip_handler = page_flip_handler;
 
        gettimeofday(&end, NULL);
-       gettimeofday(&o->last_flip_ts, NULL);
+       gettimeofday(&o->last_flip, NULL);
        end.tv_sec += duration;
 
        while (1) {