From c41bcef85d0f76262947ef408af20ad6a8d1aa23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Sun, 8 Aug 2010 17:09:22 +0100
Subject: [PATCH] checks: skip jifmux tests if required elements aren't
available
This commit is out of sequence, it really belongs between commits
15098331412ceb982c24b89bb4346354fb56433c (Automatic update of
common submodule) and dd26f378b01d679834f12935efc7093fb5807956
(configure: Fix the CELT checks to ...)
---
tests/check/elements/jifmux.c | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/tests/check/elements/jifmux.c b/tests/check/elements/jifmux.c
index 70f11a76fb..8e3e8df686 100644
--- a/tests/check/elements/jifmux.c
+++ b/tests/check/elements/jifmux.c
@@ -298,31 +298,25 @@ GST_START_TEST (test_jifmux_tags)
GST_END_TEST;
+#define HAVE_ELEMENT(name) \
+ gst_default_registry_check_feature_version (name,\
+ GST_VERSION_MAJOR, GST_VERSION_MINOR, 0)
+
static Suite *
-asfmux_suite (void)
+jifmux_suite (void)
{
Suite *s = suite_create ("jifmux");
TCase *tc_chain = tcase_create ("general");
- tcase_add_test (tc_chain, test_jifmux_tags);
+
+ if (HAVE_ELEMENT ("taginject") && HAVE_ELEMENT ("jpegenc")) {
+ tcase_add_test (tc_chain, test_jifmux_tags);
+ } else {
+ GST_WARNING ("jpegenc or taginject element not available, skipping tests");
+ }
suite_add_tcase (s, tc_chain);
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 (jifmux);