From d98e82d667ff9ef6cbadb5d52758168071680f71 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 2 Jan 2017 14:52:29 +0100 Subject: check: Use gst_check_run_suite Ensures that xunit reports get generated when requested --- tests/check/elements/h264parse.c | 20 ++++---------------- tests/check/elements/rtponvifparse.c | 16 +--------------- tests/check/libs/player.c | 20 +------------------- 3 files changed, 6 insertions(+), 50 deletions(-) diff --git a/tests/check/elements/h264parse.c b/tests/check/elements/h264parse.c index d2515e8e7..d797bc634 100644 --- a/tests/check/elements/h264parse.c +++ b/tests/check/elements/h264parse.c @@ -454,10 +454,7 @@ main (int argc, char **argv) ctx_suite = "h264parse_to_bs_nal"; s = h264parse_suite (); - sr = srunner_create (s); - srunner_run_all (sr, CK_NORMAL); - nf += srunner_ntests_failed (sr); - srunner_free (sr); + nf += gst_check_run_suite (s, ctx_suite, __FILE__ "_to_bs_nal.c"); /* setup and tweak to handle bs au output */ ctx_suite = "h264parse_to_bs_au"; @@ -466,10 +463,7 @@ main (int argc, char **argv) ctx_discard = 0; s = h264parse_suite (); - sr = srunner_create (s); - srunner_run_all (sr, CK_NORMAL); - nf += srunner_ntests_failed (sr); - srunner_free (sr); + nf += gst_check_run_suite (s, ctx_suite, __FILE__ "_to_bs_au.c"); /* setup and tweak to handle avc au output */ ctx_suite = "h264parse_to_avc_au"; @@ -493,10 +487,7 @@ main (int argc, char **argv) ctx_codec_data = TRUE; s = h264parse_suite (); - sr = srunner_create (s); - srunner_run_all (sr, CK_NORMAL); - nf += srunner_ntests_failed (sr); - srunner_free (sr); + nf += gst_check_run_suite (s, ctx_suite, __FILE__ "_to_avc3_au.c"); /* setup and tweak to handle avc packetized input */ h264_codec_data = h264_avc_codec_data; @@ -517,10 +508,7 @@ main (int argc, char **argv) ctx_verify_buffer = verify_buffer_packetized; s = h264parse_packetized_suite (); - sr = srunner_create (s); - srunner_run_all (sr, CK_NORMAL); - nf += srunner_ntests_failed (sr); - srunner_free (sr); + nf += gst_check_run_suite (s, ctx_suite, __FILE__ "_packetized.c"); return nf; } diff --git a/tests/check/elements/rtponvifparse.c b/tests/check/elements/rtponvifparse.c index 4651ac830..5299825d8 100644 --- a/tests/check/elements/rtponvifparse.c +++ b/tests/check/elements/rtponvifparse.c @@ -229,18 +229,4 @@ onviftimestamp_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - Suite *s = onviftimestamp_suite (); - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (onviftimestamp); diff --git a/tests/check/libs/player.c b/tests/check/libs/player.c index 5e62477b5..bd9b47d73 100644 --- a/tests/check/libs/player.c +++ b/tests/check/libs/player.c @@ -1720,22 +1720,4 @@ player_suite (void) return s; } -int -main (int argc, char **argv) -{ - int number_failed; - Suite *s; - SRunner *sr; - - gst_check_init (&argc, &argv); - - s = player_suite (); - sr = srunner_create (s); - - srunner_run_all (sr, CK_NORMAL); - - number_failed = srunner_ntests_failed (sr); - - srunner_free (sr); - return (number_failed == 0) ? 0 : -1; -} +GST_CHECK_MAIN (player) -- cgit v1.2.1