From e899abea14187b78683562b81dced4713989280a Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 2 Jun 2015 16:02:37 +0200 Subject: [PATCH] check: Use GST_CHECK_MAIN () macro everywhere Makes source code smaller, and ensures we go through common initialization path (like the one that sets up XML unit test output ...) --- tests/check/elements/asfmux.c | 17 +-------- tests/check/elements/faac.c | 17 +-------- tests/check/elements/faad.c | 17 +-------- tests/check/elements/h263parse.c | 32 +++++------------ tests/check/elements/hlsdemux_m3u8.c | 23 +++---------- tests/check/elements/jpegparse.c | 17 +-------- tests/check/elements/kate.c | 17 +-------- tests/check/elements/mpeg2enc.c | 17 +-------- tests/check/elements/mpeg4videoparse.c | 38 ++++++--------------- tests/check/elements/mpegvideoparse.c | 37 ++++++-------------- tests/check/elements/mplex.c | 17 +-------- tests/check/elements/opus.c | 17 +-------- tests/check/elements/rtponvif.c | 16 +-------- tests/check/elements/timidity.c | 17 +-------- tests/check/elements/voaacenc.c | 17 +-------- tests/check/elements/voamrwbenc.c | 17 +-------- tests/check/libs/h264parser.c | 18 +--------- tests/check/libs/mpegts.c | 18 +--------- tests/check/libs/mpegvideoparser.c | 20 ++--------- tests/check/libs/vc1parser.c | 18 +--------- tests/check/libs/vp8parser.c | 20 ++--------- tests/check/pipelines/simple-launch-lines.c | 17 +-------- tests/check/pipelines/streamheader.c | 17 +-------- 23 files changed, 55 insertions(+), 406 deletions(-) diff --git a/tests/check/elements/asfmux.c b/tests/check/elements/asfmux.c index 3c8084520e..6cb3e6cb0d 100644 --- a/tests/check/elements/asfmux.c +++ b/tests/check/elements/asfmux.c @@ -202,19 +202,4 @@ asfmux_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = asfmux_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 (asfmux); diff --git a/tests/check/elements/faac.c b/tests/check/elements/faac.c index 5dfd99bec7..33d013d98c 100644 --- a/tests/check/elements/faac.c +++ b/tests/check/elements/faac.c @@ -242,19 +242,4 @@ faac_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = faac_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 (faac); diff --git a/tests/check/elements/faad.c b/tests/check/elements/faad.c index f0714e4310..d6287af308 100644 --- a/tests/check/elements/faad.c +++ b/tests/check/elements/faad.c @@ -206,19 +206,4 @@ faad_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = faad_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 (faad); diff --git a/tests/check/elements/h263parse.c b/tests/check/elements/h263parse.c index 13ec773082..3616b413bc 100644 --- a/tests/check/elements/h263parse.c +++ b/tests/check/elements/h263parse.c @@ -134,6 +134,13 @@ h263parse_suite (void) Suite *s = suite_create ("h263parse"); TCase *tc_chain = tcase_create ("general"); + /* init test context */ + ctx_factory = "h263parse"; + ctx_sink_template = &sinktemplate; + ctx_src_template = &srctemplate; + /* no timing info to parse */ + ctx_no_metadata = TRUE; + suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_parse_normal); tcase_add_test (tc_chain, test_parse_drain_single); @@ -149,27 +156,4 @@ h263parse_suite (void) * - Both push- and pull-modes need to be tested * * Pull-mode & EOS */ - -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = h263parse_suite (); - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - /* init test context */ - ctx_factory = "h263parse"; - ctx_sink_template = &sinktemplate; - ctx_src_template = &srctemplate; - /* no timing info to parse */ - ctx_no_metadata = TRUE; - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (h263parse); diff --git a/tests/check/elements/hlsdemux_m3u8.c b/tests/check/elements/hlsdemux_m3u8.c index 4ca984059f..07fe6d693d 100644 --- a/tests/check/elements/hlsdemux_m3u8.c +++ b/tests/check/elements/hlsdemux_m3u8.c @@ -1307,6 +1307,9 @@ hlsdemux_suite (void) Suite *s = suite_create ("hlsdemux_m3u8"); TCase *tc_m3u8 = tcase_create ("m3u8client"); + GST_DEBUG_CATEGORY_INIT (fragmented_debug, "hlsdemux_m3u", 0, + "hlsdemux m3u test"); + suite_add_tcase (s, tc_m3u8); tcase_add_test (tc_m3u8, test_load_main_playlist_invalid); tcase_add_test (tc_m3u8, test_load_main_playlist_rendition); @@ -1342,22 +1345,4 @@ hlsdemux_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = hlsdemux_suite (); - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - GST_DEBUG_CATEGORY_INIT (fragmented_debug, "hlsdemux_m3u", 0, - "hlsdemux m3u test"); - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (hlsdemux); diff --git a/tests/check/elements/jpegparse.c b/tests/check/elements/jpegparse.c index 80c26e88de..ab97f86bb0 100644 --- a/tests/check/elements/jpegparse.c +++ b/tests/check/elements/jpegparse.c @@ -382,19 +382,4 @@ jpegparse_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = jpegparse_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 (jpegparse); diff --git a/tests/check/elements/kate.c b/tests/check/elements/kate.c index 98eccf241b..12e00f1bd5 100644 --- a/tests/check/elements/kate.c +++ b/tests/check/elements/kate.c @@ -880,19 +880,4 @@ kate_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = kate_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 (kate); diff --git a/tests/check/elements/mpeg2enc.c b/tests/check/elements/mpeg2enc.c index 24c7ab14d1..53a52b720e 100644 --- a/tests/check/elements/mpeg2enc.c +++ b/tests/check/elements/mpeg2enc.c @@ -192,19 +192,4 @@ mpeg2enc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = mpeg2enc_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 (mpeg2enc); diff --git a/tests/check/elements/mpeg4videoparse.c b/tests/check/elements/mpeg4videoparse.c index 6cedc94ef1..2f5e2fcd0b 100644 --- a/tests/check/elements/mpeg4videoparse.c +++ b/tests/check/elements/mpeg4videoparse.c @@ -156,6 +156,16 @@ mpeg4videoparse_suite (void) Suite *s = suite_create ("mpeg4videoparse"); TCase *tc_chain = tcase_create ("general"); + /* init test context */ + ctx_factory = "mpeg4videoparse"; + ctx_sink_template = &sinktemplate; + ctx_src_template = &srctemplate; + ctx_headers[0].data = mpeg4_config; + ctx_headers[0].size = sizeof (mpeg4_config); + ctx_verify_buffer = verify_buffer; + /* no timing info to parse */ + ctx_no_metadata = TRUE; + suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_parse_normal); tcase_add_test (tc_chain, test_parse_drain_single); @@ -171,30 +181,4 @@ mpeg4videoparse_suite (void) * - Both push- and pull-modes need to be tested * * Pull-mode & EOS */ - -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = mpeg4videoparse_suite (); - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - /* init test context */ - ctx_factory = "mpeg4videoparse"; - ctx_sink_template = &sinktemplate; - ctx_src_template = &srctemplate; - ctx_headers[0].data = mpeg4_config; - ctx_headers[0].size = sizeof (mpeg4_config); - ctx_verify_buffer = verify_buffer; - /* no timing info to parse */ - ctx_no_metadata = TRUE; - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (mpeg4videoparse); diff --git a/tests/check/elements/mpegvideoparse.c b/tests/check/elements/mpegvideoparse.c index 07d73bf759..58c4ee5780 100644 --- a/tests/check/elements/mpegvideoparse.c +++ b/tests/check/elements/mpegvideoparse.c @@ -240,6 +240,16 @@ mpegvideoparse_suite (void) Suite *s = suite_create ("mpegvideoparse"); TCase *tc_chain = tcase_create ("general"); + /* init test context */ + ctx_factory = "mpegvideoparse"; + ctx_sink_template = &sinktemplate; + ctx_src_template = &srctemplate; + ctx_headers[0].data = mpeg2_seq; + ctx_headers[0].size = sizeof (mpeg2_seq); + ctx_verify_buffer = verify_buffer; + ctx_setup = setup_element; + + suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_parse_normal); tcase_add_test (tc_chain, test_parse_drain_single); @@ -257,29 +267,4 @@ mpegvideoparse_suite (void) * - Both push- and pull-modes need to be tested * * Pull-mode & EOS */ - -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = mpegvideoparse_suite (); - SRunner *sr = srunner_create (s); - - gst_check_init (&argc, &argv); - - /* init test context */ - ctx_factory = "mpegvideoparse"; - ctx_sink_template = &sinktemplate; - ctx_src_template = &srctemplate; - ctx_headers[0].data = mpeg2_seq; - ctx_headers[0].size = sizeof (mpeg2_seq); - ctx_verify_buffer = verify_buffer; - ctx_setup = setup_element; - - srunner_run_all (sr, CK_NORMAL); - nf = srunner_ntests_failed (sr); - srunner_free (sr); - - return nf; -} +GST_CHECK_MAIN (mpegvideoparse); diff --git a/tests/check/elements/mplex.c b/tests/check/elements/mplex.c index 0e894eb30a..b65632ce3b 100644 --- a/tests/check/elements/mplex.c +++ b/tests/check/elements/mplex.c @@ -298,19 +298,4 @@ mplex_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = mplex_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 (mplex); diff --git a/tests/check/elements/opus.c b/tests/check/elements/opus.c index e7f9c3a9d7..3afeb4ed53 100644 --- a/tests/check/elements/opus.c +++ b/tests/check/elements/opus.c @@ -375,19 +375,4 @@ opus_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = opus_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 (opus); diff --git a/tests/check/elements/rtponvif.c b/tests/check/elements/rtponvif.c index d5eaf46222..cce808b884 100644 --- a/tests/check/elements/rtponvif.c +++ b/tests/check/elements/rtponvif.c @@ -436,18 +436,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/elements/timidity.c b/tests/check/elements/timidity.c index 339d140385..5c85b65672 100644 --- a/tests/check/elements/timidity.c +++ b/tests/check/elements/timidity.c @@ -71,19 +71,4 @@ timidity_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = timidity_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 (timidity); diff --git a/tests/check/elements/voaacenc.c b/tests/check/elements/voaacenc.c index 0cbeec0953..15530d8b7c 100644 --- a/tests/check/elements/voaacenc.c +++ b/tests/check/elements/voaacenc.c @@ -245,19 +245,4 @@ voaacenc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = voaacenc_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 (voaacenc); diff --git a/tests/check/elements/voamrwbenc.c b/tests/check/elements/voamrwbenc.c index a6d3a010c2..1a8bf4eb69 100644 --- a/tests/check/elements/voamrwbenc.c +++ b/tests/check/elements/voamrwbenc.c @@ -176,19 +176,4 @@ voamrwbenc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = voamrwbenc_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 (voamrwbenc); diff --git a/tests/check/libs/h264parser.c b/tests/check/libs/h264parser.c index 65fd0c73c0..cc355191ae 100644 --- a/tests/check/libs/h264parser.c +++ b/tests/check/libs/h264parser.c @@ -225,20 +225,4 @@ h264parser_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = h264parser_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 (h264parser); diff --git a/tests/check/libs/mpegts.c b/tests/check/libs/mpegts.c index d96211a003..a1ce6e8758 100644 --- a/tests/check/libs/mpegts.c +++ b/tests/check/libs/mpegts.c @@ -581,20 +581,4 @@ mpegts_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = mpegts_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 (mpegts); diff --git a/tests/check/libs/mpegvideoparser.c b/tests/check/libs/mpegvideoparser.c index 914dd6c114..b92516916d 100644 --- a/tests/check/libs/mpegvideoparser.c +++ b/tests/check/libs/mpegvideoparser.c @@ -164,7 +164,7 @@ GST_START_TEST (test_mis_identified_datas) GST_END_TEST; static Suite * -videoparsers_suite (void) +mpegvideoparsers_suite (void) { Suite *s = suite_create ("Video Parsers library"); @@ -179,20 +179,4 @@ videoparsers_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = videoparsers_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 (mpegvideoparsers); diff --git a/tests/check/libs/vc1parser.c b/tests/check/libs/vc1parser.c index cb0bce70fb..5ce4328c02 100644 --- a/tests/check/libs/vc1parser.c +++ b/tests/check/libs/vc1parser.c @@ -1273,20 +1273,4 @@ vc1parser_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = vc1parser_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 (vc1parser); diff --git a/tests/check/libs/vp8parser.c b/tests/check/libs/vp8parser.c index b03b7441fb..784e20f452 100644 --- a/tests/check/libs/vp8parser.c +++ b/tests/check/libs/vp8parser.c @@ -212,7 +212,7 @@ GST_START_TEST (test_vp8_parse_inter_frame) GST_END_TEST; static Suite * -videoparsers_suite (void) +vp8parsers_suite (void) { Suite *s = suite_create ("VP8 Parser library"); @@ -225,20 +225,4 @@ videoparsers_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = videoparsers_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 (vp8parsers); diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index 3605f12575..d67adb00e8 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -349,19 +349,4 @@ GST_END_TEST return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = simple_launch_lines_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 (simple_launch_lines); diff --git a/tests/check/pipelines/streamheader.c b/tests/check/pipelines/streamheader.c index d3346df015..63a8f546fe 100644 --- a/tests/check/pipelines/streamheader.c +++ b/tests/check/pipelines/streamheader.c @@ -261,19 +261,4 @@ streamheader_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = streamheader_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 (streamheader);