From ce16635f46bbfab45d34d660ee95bacdf8edb76d Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 2 Jun 2015 16:14:39 +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/generic/clock-selection.c | 19 ++----------------- tests/check/libs/allocators.c | 17 +---------------- tests/check/libs/audio.c | 18 +----------------- tests/check/libs/fft.c | 17 +---------------- tests/check/libs/navigation.c | 17 +---------------- tests/check/libs/rtp.c | 17 +---------------- tests/check/libs/rtsp.c | 17 +---------------- tests/check/libs/rtspconnection.c | 17 +---------------- tests/check/libs/tag.c | 17 +---------------- tests/check/libs/xmpwriter.c | 17 +---------------- tests/check/pipelines/basetime.c | 17 +---------------- .../pipelines/capsfilter-renegotiation.c | 17 +---------------- tests/check/pipelines/gio.c | 19 ++----------------- tests/check/pipelines/simple-launch-lines.c | 17 +---------------- tests/check/pipelines/theoraenc.c | 17 +---------------- tests/check/pipelines/vorbisdec.c | 19 ++----------------- tests/check/pipelines/vorbisenc.c | 17 +---------------- 17 files changed, 20 insertions(+), 276 deletions(-) diff --git a/tests/check/generic/clock-selection.c b/tests/check/generic/clock-selection.c index 703ffd88db..cfea856d9c 100644 --- a/tests/check/generic/clock-selection.c +++ b/tests/check/generic/clock-selection.c @@ -43,7 +43,7 @@ GST_START_TEST (test_add) GST_END_TEST; static Suite * -volume_suite (void) +clocks_suite (void) { Suite *s = suite_create ("clocks"); TCase *tc_chain = tcase_create ("general"); @@ -54,19 +54,4 @@ volume_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = volume_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 (clocks); diff --git a/tests/check/libs/allocators.c b/tests/check/libs/allocators.c index f2b92c7d81..c96edf1613 100644 --- a/tests/check/libs/allocators.c +++ b/tests/check/libs/allocators.c @@ -72,19 +72,4 @@ allocators_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = allocators_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 (allocators); diff --git a/tests/check/libs/audio.c b/tests/check/libs/audio.c index d95923ee83..e19fd620e0 100644 --- a/tests/check/libs/audio.c +++ b/tests/check/libs/audio.c @@ -630,20 +630,4 @@ audio_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = audio_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 (audio); diff --git a/tests/check/libs/fft.c b/tests/check/libs/fft.c index 8151797eb4..dccaae552f 100644 --- a/tests/check/libs/fft.c +++ b/tests/check/libs/fft.c @@ -545,19 +545,4 @@ fft_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = fft_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 (fft); diff --git a/tests/check/libs/navigation.c b/tests/check/libs/navigation.c index b33b497af0..930e42ac46 100644 --- a/tests/check/libs/navigation.c +++ b/tests/check/libs/navigation.c @@ -306,19 +306,4 @@ navigation_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = navigation_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 (navigation); diff --git a/tests/check/libs/rtp.c b/tests/check/libs/rtp.c index 2c0ffdf2e3..ac6c15d57f 100644 --- a/tests/check/libs/rtp.c +++ b/tests/check/libs/rtp.c @@ -1004,19 +1004,4 @@ rtp_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = rtp_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 (rtp); diff --git a/tests/check/libs/rtsp.c b/tests/check/libs/rtsp.c index 0730a318e3..ba23f0c3b5 100644 --- a/tests/check/libs/rtsp.c +++ b/tests/check/libs/rtsp.c @@ -672,19 +672,4 @@ rtsp_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = rtsp_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 (rtsp); diff --git a/tests/check/libs/rtspconnection.c b/tests/check/libs/rtspconnection.c index 3fc77ca167..ee3c18cdf0 100644 --- a/tests/check/libs/rtspconnection.c +++ b/tests/check/libs/rtspconnection.c @@ -817,19 +817,4 @@ rtspconnection_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = rtspconnection_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 (rtspconnection); diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c index 38f18c3e88..16b5dcfacf 100644 --- a/tests/check/libs/tag.c +++ b/tests/check/libs/tag.c @@ -1811,19 +1811,4 @@ tag_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = tag_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 (tag); diff --git a/tests/check/libs/xmpwriter.c b/tests/check/libs/xmpwriter.c index e7889d604c..6a84e10767 100644 --- a/tests/check/libs/xmpwriter.c +++ b/tests/check/libs/xmpwriter.c @@ -203,19 +203,4 @@ xmp_config_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = xmp_config_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 (xmp_config); diff --git a/tests/check/pipelines/basetime.c b/tests/check/pipelines/basetime.c index 1664188f14..228e97c2f1 100644 --- a/tests/check/pipelines/basetime.c +++ b/tests/check/pipelines/basetime.c @@ -156,19 +156,4 @@ baseaudiosrc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = baseaudiosrc_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 (baseaudiosrc); diff --git a/tests/check/pipelines/capsfilter-renegotiation.c b/tests/check/pipelines/capsfilter-renegotiation.c index 727093605d..4a3fc98abd 100644 --- a/tests/check/pipelines/capsfilter-renegotiation.c +++ b/tests/check/pipelines/capsfilter-renegotiation.c @@ -168,19 +168,4 @@ capsfilter_renegotiation_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = capsfilter_renegotiation_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 (capsfilter_renegotiation); diff --git a/tests/check/pipelines/gio.c b/tests/check/pipelines/gio.c index 5ce6688c15..60b45c2a9b 100644 --- a/tests/check/pipelines/gio.c +++ b/tests/check/pipelines/gio.c @@ -151,7 +151,7 @@ GST_START_TEST (test_memory_stream) GST_END_TEST; static Suite * -gio_testsuite (void) +gio_suite (void) { Suite *s = suite_create ("gio"); TCase *tc_chain = tcase_create ("general"); @@ -162,19 +162,4 @@ gio_testsuite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = gio_testsuite (); - 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 (gio); diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index 7a6b76c7a5..d3e9bb7c4e 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -222,19 +222,4 @@ simple_launch_lines_suite (void) 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/theoraenc.c b/tests/check/pipelines/theoraenc.c index 03750ff5e3..ff8b6e1fbc 100644 --- a/tests/check/pipelines/theoraenc.c +++ b/tests/check/pipelines/theoraenc.c @@ -328,19 +328,4 @@ theoraenc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = theoraenc_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 (theoraenc); diff --git a/tests/check/pipelines/vorbisdec.c b/tests/check/pipelines/vorbisdec.c index 43c673a0a5..51b7f38bbf 100644 --- a/tests/check/pipelines/vorbisdec.c +++ b/tests/check/pipelines/vorbisdec.c @@ -94,7 +94,7 @@ GST_END_TEST; #endif /* #ifndef GST_DISABLE_PARSE */ static Suite * -vorbisenc_suite (void) +vorbisdec_suite (void) { Suite *s = suite_create ("vorbisdec"); TCase *tc_chain = tcase_create ("general"); @@ -107,19 +107,4 @@ vorbisenc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = vorbisenc_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 (vorbisdec); diff --git a/tests/check/pipelines/vorbisenc.c b/tests/check/pipelines/vorbisenc.c index a9bb2bebed..246c903c72 100644 --- a/tests/check/pipelines/vorbisenc.c +++ b/tests/check/pipelines/vorbisenc.c @@ -392,19 +392,4 @@ vorbisenc_suite (void) return s; } -int -main (int argc, char **argv) -{ - int nf; - - Suite *s = vorbisenc_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 (vorbisenc);