intel-gpu-tools: add igt_core init func calls to some tests

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.

Signed-off-by: Tim Gore <tim.gore@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Tim Gore 2014-06-20 11:28:12 +01:00 committed by Thomas Wood
parent 236d6bd2d3
commit 8abca6fd14
6 changed files with 8 additions and 12 deletions

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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]);

View File

@ -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;
}

View File

@ -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);