diff options
-rw-r--r-- | tests/gem_ctx_basic.c | 2 | ||||
-rw-r--r-- | tests/gem_exec_blt.c | 2 | ||||
-rw-r--r-- | tests/gem_gtt_speed.c | 2 | ||||
-rw-r--r-- | tests/gem_hang.c | 2 | ||||
-rw-r--r-- | tests/gem_ppgtt.c | 2 | ||||
-rw-r--r-- | tests/gem_render_copy.c | 2 | ||||
-rw-r--r-- | tests/gem_render_copy_redux.c | 2 | ||||
-rw-r--r-- | tests/gem_render_linear_blits.c | 2 | ||||
-rw-r--r-- | tests/gem_render_tiled_blits.c | 2 | ||||
-rw-r--r-- | tests/gem_seqno_wrap.c | 7 | ||||
-rw-r--r-- | tests/gem_stress.c | 2 | ||||
-rw-r--r-- | tests/gem_userptr_blits.c | 2 | ||||
-rw-r--r-- | tests/gen3_mixed_blits.c | 2 | ||||
-rw-r--r-- | tests/gen3_render_linear_blits.c | 2 | ||||
-rw-r--r-- | tests/gen3_render_mixed_blits.c | 2 | ||||
-rw-r--r-- | tests/gen3_render_tiledx_blits.c | 2 | ||||
-rw-r--r-- | tests/gen3_render_tiledy_blits.c | 2 | ||||
-rw-r--r-- | tests/testdisplay.c | 4 |
18 files changed, 18 insertions, 25 deletions
diff --git a/tests/gem_ctx_basic.c b/tests/gem_ctx_basic.c index a0bec602..b8b01c03 100644 --- a/tests/gem_ctx_basic.c +++ b/tests/gem_ctx_basic.c @@ -166,5 +166,5 @@ int main(int argc, char *argv[]) free(threads); close(fd); - return 0; + igt_exit(); } diff --git a/tests/gem_exec_blt.c b/tests/gem_exec_blt.c index db997b33..301c9397 100644 --- a/tests/gem_exec_blt.c +++ b/tests/gem_exec_blt.c @@ -270,5 +270,5 @@ int main(int argc, char **argv) } else run(OBJECT_SIZE); - return 0; + igt_exit(); } diff --git a/tests/gem_gtt_speed.c b/tests/gem_gtt_speed.c index 5125078d..c8581035 100644 --- a/tests/gem_gtt_speed.c +++ b/tests/gem_gtt_speed.c @@ -329,5 +329,5 @@ int main(int argc, char **argv) gem_close(fd, handle); close(fd); - return 0; + igt_exit(); } diff --git a/tests/gem_hang.c b/tests/gem_hang.c index 7a7c8acb..8767615c 100644 --- a/tests/gem_hang.c +++ b/tests/gem_hang.c @@ -93,5 +93,5 @@ int main(int argc, char **argv) close(fd); - return 0; + igt_exit(); } diff --git a/tests/gem_ppgtt.c b/tests/gem_ppgtt.c index 8c560f26..0ee4f5b2 100644 --- a/tests/gem_ppgtt.c +++ b/tests/gem_ppgtt.c @@ -230,6 +230,4 @@ int main(int argc, char **argv) } igt_exit(); - - return 0; } diff --git a/tests/gem_render_copy.c b/tests/gem_render_copy.c index 6ff0c776..094816c9 100644 --- a/tests/gem_render_copy.c +++ b/tests/gem_render_copy.c @@ -186,5 +186,5 @@ int main(int argc, char **argv) scratch_buf_check(&data, &dst, WIDTH - 10, HEIGHT - 10, SRC_COLOR); } - return 0; + igt_exit(); } diff --git a/tests/gem_render_copy_redux.c b/tests/gem_render_copy_redux.c index cb48aa73..6fc82df9 100644 --- a/tests/gem_render_copy_redux.c +++ b/tests/gem_render_copy_redux.c @@ -241,6 +241,4 @@ int main(int argc, char **argv) } igt_exit(); - - return 0; } diff --git a/tests/gem_render_linear_blits.c b/tests/gem_render_linear_blits.c index 28fd8c8c..60ba8316 100644 --- a/tests/gem_render_linear_blits.c +++ b/tests/gem_render_linear_blits.c @@ -200,5 +200,5 @@ int main(int argc, char **argv) for (i = 0; i < count; i++) check_bo(fd, bo[i]->handle, start_val[i]); - return 0; + igt_exit(); } diff --git a/tests/gem_render_tiled_blits.c b/tests/gem_render_tiled_blits.c index ea1d59da..dc22529c 100644 --- a/tests/gem_render_tiled_blits.c +++ b/tests/gem_render_tiled_blits.c @@ -211,5 +211,5 @@ int main(int argc, char **argv) for (i = 0; i < count; i++) check_bo(batch, &buf[i], start_val[i]); - return 0; + igt_exit(); } diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c index e8528ec6..6772d1e1 100644 --- a/tests/gem_seqno_wrap.c +++ b/tests/gem_seqno_wrap.c @@ -527,10 +527,7 @@ int main(int argc, char **argv) options.dontwrap ? "tests" : "wraps", wcount); } - if (options.rounds == wcount) { - igt_debug("done %d wraps successfully\n", wcount); - return 0; - } + igt_assert(options.rounds == wcount); - return r; + igt_exit(); } diff --git a/tests/gem_stress.c b/tests/gem_stress.c index 8d62b035..ab2cd0eb 100644 --- a/tests/gem_stress.c +++ b/tests/gem_stress.c @@ -914,5 +914,5 @@ int main(int argc, char **argv) igt_stop_signal_helper(); - return 0; + igt_exit(); } diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c index 638b74c2..a729f319 100644 --- a/tests/gem_userptr_blits.c +++ b/tests/gem_userptr_blits.c @@ -1443,6 +1443,4 @@ int main(int argc, char **argv) test_access_control(fd); igt_exit(); - - return 0; } diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c index 33eea746..2d41cb4e 100644 --- a/tests/gen3_mixed_blits.c +++ b/tests/gen3_mixed_blits.c @@ -533,5 +533,5 @@ int main(int argc, char **argv) check_bo(fd, handle[i], start_val[i]); igt_info("done\n"); - return 0; + igt_exit(); } diff --git a/tests/gen3_render_linear_blits.c b/tests/gen3_render_linear_blits.c index 7d4a228f..9bf9c306 100644 --- a/tests/gen3_render_linear_blits.c +++ b/tests/gen3_render_linear_blits.c @@ -393,5 +393,5 @@ int main(int argc, char **argv) for (i = 0; i < count; i++) check_bo(fd, handle[i], start_val[i]); - return 0; + igt_exit(); } diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c index 1fe323c4..bdfd66f6 100644 --- a/tests/gen3_render_mixed_blits.c +++ b/tests/gen3_render_mixed_blits.c @@ -421,5 +421,5 @@ int main(int argc, char **argv) check_bo(fd, handle[i], start_val[i]); igt_info("done\n"); - return 0; + igt_exit(); } diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c index d8e2e87f..92a77f21 100644 --- a/tests/gen3_render_tiledx_blits.c +++ b/tests/gen3_render_tiledx_blits.c @@ -400,5 +400,5 @@ int main(int argc, char **argv) for (i = 0; i < count; i++) check_bo(fd, handle[i], start_val[i]); - return 0; + igt_exit(); } diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c index 1a819e56..8927c0b4 100644 --- a/tests/gen3_render_tiledy_blits.c +++ b/tests/gen3_render_tiledy_blits.c @@ -407,5 +407,5 @@ int main(int argc, char **argv) check_bo(fd, handle[i], start_val[i]); igt_info("done\n"); - return 0; + igt_exit(); } diff --git a/tests/testdisplay.c b/tests/testdisplay.c index a3cba44e..04e41db8 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -786,5 +786,7 @@ out_mainloop: out_close: close(drm_fd); - return ret; + igt_assert(ret); + + igt_exit(); } |