tests: Use the gst_check_run_suite helper everywhere

Using GST_CHECK_MAIN where appropriate

This way it is possible to specify an XML file to store tests results in

diff --git a/tests/check/ges/asset.c b/tests/check/ges/asset.c
index 00c2a00..00caca1 100644 (file)
--- a/tests/check/ges/asset.c
+++ b/tests/check/ges/asset.c
@@ -156,6 +156,7 @@ ges_suite (void)
   TCase *tc_chain = tcase_create ("a");
 
   suite_add_tcase (s, tc_chain);
+  ges_init ();
 
   /* Must be first until we implement deinit */
   tcase_add_test (tc_chain, test_list_asset);
@@ -166,20 +167,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-  ges_init ();
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (ges);

diff --git a/tests/check/ges/backgroundsource.c b/tests/check/ges/backgroundsource.c
index 92cbd12..885d0e2 100644 (file)
--- a/tests/check/ges/backgroundsource.c
+++ b/tests/check/ges/backgroundsource.c
@@ -357,19 +357,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/basic.c b/tests/check/ges/basic.c
index efbc79e..5fe8eec 100644 (file)
--- a/tests/check/ges/basic.c
+++ b/tests/check/ges/basic.c
@@ -707,19 +707,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/clip.c b/tests/check/ges/clip.c
index 674b3c9..fa3f2f5 100644 (file)
--- a/tests/check/ges/clip.c
+++ b/tests/check/ges/clip.c
@@ -387,19 +387,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/effects.c b/tests/check/ges/effects.c
index 0b8b6c0..cab1f06 100644 (file)
--- a/tests/check/ges/effects.c
+++ b/tests/check/ges/effects.c
@@ -489,19 +489,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/layer.c b/tests/check/ges/layer.c
index 040ece1..b29d38b 100644 (file)
--- a/tests/check/ges/layer.c
+++ b/tests/check/ges/layer.c
@@ -1811,19 +1811,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/overlays.c b/tests/check/ges/overlays.c
index fe98681..1d19789 100644 (file)
--- a/tests/check/ges/overlays.c
+++ b/tests/check/ges/overlays.c
@@ -214,19 +214,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/project.c b/tests/check/ges/project.c
index 32e04a4..f9f7ecb 100644 (file)
--- a/tests/check/ges/project.c
+++ b/tests/check/ges/project.c
@@ -697,6 +697,7 @@ ges_suite (void)
   TCase *tc_chain = tcase_create ("project");
 
   suite_add_tcase (s, tc_chain);
+  ges_init ();
 
   tcase_add_test (tc_chain, test_project_simple);
   tcase_add_test (tc_chain, test_project_add_assets);
@@ -709,20 +710,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-  ges_init ();
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (ges);

diff --git a/tests/check/ges/simplelayer.c b/tests/check/ges/simplelayer.c
index 61d25ad..9a316f8 100644 (file)
--- a/tests/check/ges/simplelayer.c
+++ b/tests/check/ges/simplelayer.c
@@ -470,19 +470,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/text_properties.c b/tests/check/ges/text_properties.c
index 936492b..1c2d71a 100644 (file)
--- a/tests/check/ges/text_properties.c
+++ b/tests/check/ges/text_properties.c
@@ -114,19 +114,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/timelineedition.c b/tests/check/ges/timelineedition.c
index db1f284..e220339 100644 (file)
--- a/tests/check/ges/timelineedition.c
+++ b/tests/check/ges/timelineedition.c
@@ -1041,19 +1041,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/titles.c b/tests/check/ges/titles.c
index 02e371b..48df2f4 100644 (file)
--- a/tests/check/ges/titles.c
+++ b/tests/check/ges/titles.c
@@ -218,19 +218,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/transition.c b/tests/check/ges/transition.c
index e76bdae..20258a7 100644 (file)
--- a/tests/check/ges/transition.c
+++ b/tests/check/ges/transition.c
@@ -186,19 +186,4 @@ ges_suite (void)
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = ges_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 (ges);

diff --git a/tests/check/ges/uriclip.c b/tests/check/ges/uriclip.c
index 39cf75e..a00f29e 100644 (file)
--- a/tests/check/ges/uriclip.c
+++ b/tests/check/ges/uriclip.c
@@ -281,16 +281,13 @@ main (int argc, char **argv)
   int nf;
 
   Suite *s = ges_suite ();
-  SRunner *sr = srunner_create (s);
 
   gst_check_init (&argc, &argv);
 
   av_uri = ges_test_get_audio_video_uri ();
   image_uri = ges_test_get_image_uri ();
 
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
+  nf = gst_check_run_suite (s, "ges", __FILE__);
 
   g_free (av_uri);
   g_free (image_uri);