kms_cursor_crc: Wrap cursor fb creating into igt_fixture
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 25 Apr 2014 10:49:11 +0000 (13:49 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 25 Apr 2014 13:18:19 +0000 (16:18 +0300)
We don't want to attempt creating the cursor fb when enumerating
subtests. So wrap it into igt_fixture. Also destroy the cursor
fb after the tests.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
tests/kms_cursor_crc.c

index 5e697ea..ddcdb7d 100644 (file)
@@ -354,7 +354,8 @@ static void run_test_generic(data_t *data, int cursor_max_size)
                igt_require(cursor_max_size >= cursor_size);
                sprintf(c_size, "%d", cursor_size);
 
-               create_cursor_fb(data, cursor_size, cursor_size);
+               igt_fixture
+                       create_cursor_fb(data, cursor_size, cursor_size);
 
                /* Using created cursor FBs to test cursor support */
                igt_subtest_f("cursor-%s-onscreen", c_size)
@@ -365,8 +366,10 @@ static void run_test_generic(data_t *data, int cursor_max_size)
                        run_test(data, test_crc_sliding, cursor_size, cursor_size);
                igt_subtest_f("cursor-%s-random", c_size)
                        run_test(data, test_crc_random, cursor_size, cursor_size);
-       }
 
+               igt_fixture
+                       igt_remove_fb(data->drm_fd, &data->fb);
+       }
 }
 
 uint64_t cursor_width, cursor_height;