From: Tim Gore <tim.gore@xxxxxxxxx> A step towards towards removing the distinction between single and multiple tests. The first step is to change the igt_simple_main macro to pass argc/v through to the real_main function, so that several simple tests that want argc/v can still use this macro. Once this is done, all the simple tests can use this macro and we then modify this macro and the igt_simple_init function so that argc/v are available to igt_simple_init. Finally modify igt_simple_init to call the igt_subtest_init function to parse the cmdline args for --list-subtest and --help. There are some subtleties introduced by the fact that igt_subtest_init registers the check_igt_exit exit handler, so now single as well as multiple tests must always exit via igt_exit. v2: a) Moved some comments into the Doxygen function comments. b) Renamed the igt_simple_init function to __igt_simple_init to indicate that it should only be called from the framework macros. c) A few simple tests had return statements for error exits, so replaced these with igt_fail calls. This ensures that the igt_exit function is called as required by the framework. Tim Gore (2): intel-gpu-tools: pass argc/argv to simple main intel-gpu-tools: Re-use igt_subtest_init for simple tests lib/igt_core.c | 39 ++++++++++++++++++++++----------------- lib/igt_core.h | 19 +++++++++++-------- tests/gem_ctx_basic.c | 6 +----- tests/gem_exec_blt.c | 5 +---- tests/gem_gtt_hog.c | 2 +- tests/gem_gtt_speed.c | 7 ++----- tests/gem_hang.c | 5 +---- tests/gem_render_copy.c | 4 +--- tests/gem_render_linear_blits.c | 9 +++------ tests/gem_render_tiled_blits.c | 7 ++----- tests/gem_seqno_wrap.c | 11 ++++------- tests/gem_stress.c | 5 +---- tests/gen3_mixed_blits.c | 5 +---- tests/gen3_render_linear_blits.c | 5 +---- tests/gen3_render_mixed_blits.c | 5 +---- tests/gen3_render_tiledx_blits.c | 5 +---- tests/gen3_render_tiledy_blits.c | 5 +---- tests/igt_simulation.c | 4 ++-- 18 files changed, 57 insertions(+), 91 deletions(-) -- 1.9.2 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx