intel-gpu-tools: add igt_core init func calls to some tests
PATCH 1/1 intel-gpu-tools: add igt_core init func calls to some tests
From: Tim Gore <[email protected]>
igt-core.h/c provides some macros and initialisation functions to support the tests but some of the single tests do not use these. Modifying these tests to use the igt_simple_main macro and igt_simple_init function is the first step towards a consistent command line across all tests.
--- tests/gem_bad_address.c | 4 +--- tests/gem_bad_batch.c | 4 +--- tests/gem_bad_blit.c | 4 +--- tests/gem_hang.c | 2 ++ tests/gem_non_secure_batch.c | 4 +--- tests/gem_stress.c | 2 ++ 6 files changed, 8 insertions(+), 12 deletions(-)
tests/gem_bad_address.c +1 -3
@@ -60,7 +60,7 @@ bad_store(void)intel_batchbuffer_flush (batch); } -int main (int argc,char **argv) +igt_simple_main {int fd;
@@ -76,6 +76,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }
tests/gem_bad_batch.c +1 -3
@@ -56,7 +56,7 @@ bad_batch(void)intel_batchbuffer_flush (batch); } -int main (int argc,char **argv) +igt_simple_main {int fd;
@@ -72,6 +72,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }
tests/gem_bad_blit.c +1 -3
@@ -95,7 +95,7 @@ bad_blit(drm_intel_bo *src_bo, uint32_t devid)intel_batchbuffer_flush (batch); } -int main (int argc,char **argv) +igt_simple_main {drm_intel_bo *src;int fd;
@@ -114,6 +114,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }
tests/gem_hang.c +2 -0
@@ -72,6 +72,8 @@ int main(int argc, char **argv) {int fd; +igt_simple_init (); +igt_assert_f (argc ==2 ,"usage: %s <disabled pipe number>\n" , argv[0 ]);
tests/gem_non_secure_batch.c +1 -3
@@ -77,7 +77,7 @@ mi_lri_loop(void) } } -int main (int argc,char **argv) +igt_simple_main {int fd;int devid;
@@ -108,6 +108,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }
tests/gem_stress.c +2 -0
@@ -865,6 +865,8 @@ int main(int argc, char **argv)int i, j;unsigned *current_permutation, *tmp_permutation; +igt_simple_init (); + drm_fd =drm_open_any (); devid =intel_get_drm_devid (drm_fd);
Signature · 1 line
1.9.2
Quoted 9 lines · On 20 Jun 2014 11:28, <[email protected]> wrote:
From: Tim Gore <[email protected]>
igt-core.h/c provides some macros and initialisation functions to support the tests but some of the single tests do not use these. Modifying these tests to use the
igt_simple_mainmacro andigt_simple_initfunction is the first step towards a consistent command line across all tests.
This also helps add support for other common functionality such as setting the debug level.
Patch has been merged, thanks.
Review
Quoted 85 lines
Signed-off-by Tim Gore <[email protected]>--- tests/gem_bad_address.c | 4 +--- tests/gem_bad_batch.c | 4 +--- tests/gem_bad_blit.c | 4 +--- tests/gem_hang.c | 2 ++ tests/gem_non_secure_batch.c | 4 +--- tests/gem_stress.c | 2 ++ 6 files changed, 8 insertions(+), 12 deletions(-)tests/gem_bad_address.c +1
-3@@ -60,7 +60,7 @@ bad_store(void)intel_batchbuffer_flush (batch); } -int main (int argc,char **argv) +igt_simple_main {int fd;@@ -76,6 +76,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }tests/gem_bad_batch.c +1
-3@@ -56,7 +56,7 @@ bad_batch(void)intel_batchbuffer_flush (batch); } -int main (int argc,char **argv) +igt_simple_main {int fd;@@ -72,6 +72,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }tests/gem_bad_blit.c +1
-3@@ -95,7 +95,7 @@ bad_blit(drm_intel_bo *src_bo, uint32_t devid)intel_batchbuffer_flush (batch); } -int main (int argc,char **argv) +igt_simple_main {drm_intel_bo *src;int fd;@@ -114,6 +114,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }tests/gem_hang.c +2
-0@@ -72,6 +72,8 @@ int main(int argc, char **argv) {int fd; +igt_simple_init (); +igt_assert_f (argc ==2 ,"usage: %s <disabled pipe number>\n" , argv[0 ]);(quoted diff) +0
-0
b/tests/gem_non_secure_batch.c
Quoted 39 lines
index 9acfda4..01101e9 100644
tests/gem_non_secure_batch.c +1
-3@@ -77,7 +77,7 @@ mi_lri_loop(void) } } -int main (int argc,char **argv) +igt_simple_main {int fd;int devid;@@ -108,6 +108,4 @@ int main(int argc, char **argv)drm_intel_bufmgr_destroy (bufmgr);close (fd); - -return 0 ; }tests/gem_stress.c +2
-1@@ -865,6 +865,8 @@ int main(int argc, char **argv)int i, j;unsigned *current_permutation, *tmp_permutation; +igt_simple_init (); + drm_fd =drm_open_any (); devid =intel_get_drm_devid (drm_fd); --1.9.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx