diff options
author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-08-03 13:33:59 +0200 |
---|---|---|
committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-08-03 13:33:59 +0200 |
commit | 70fcf510be9e35db66c493a52c196c25669f8188 (patch) | |
tree | 891ff24a0f89009925c6ff58178bd354700645d7 /tests | |
parent | a2341918c42edc0d8e66dc4e5560cad7c5349423 (diff) | |
download | gstreamer-plugins-good-70fcf510be9e35db66c493a52c196c25669f8188.tar.gz |
Revert "tests/check/Makefile.am: Disable autodetect test temporarily, so that the build bots update -bad and the ranks of unr..."
This reverts commit 475aed8af6d2a57c1d21490c824e754a6b2367a9.
It won't consider elements from anywhere else anymore
Diffstat (limited to 'tests')
-rw-r--r-- | tests/check/Makefile.am | 6 | ||||
-rw-r--r-- | tests/check/elements/autodetect.c | 30 |
2 files changed, 3 insertions, 33 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index e81f2ad14..4f32d5505 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -118,6 +118,7 @@ check_PROGRAMS = \ elements/audiopanorama \ elements/audiowsincband \ elements/audiowsinclimit \ + elements/autodetect \ elements/avimux \ elements/avisubtitle \ elements/capssetter \ @@ -167,11 +168,6 @@ VALGRIND_TO_FIX = \ TESTS = $(check_PROGRAMS) -# these tests don't even pass -# autodetect: temporarily disabled because of broken videosinks in -bad -noinst_PROGRAMS = \ - elements/autodetect - AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) \ $(GST_OPTION_CFLAGS) -DGST_TEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" \ -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS diff --git a/tests/check/elements/autodetect.c b/tests/check/elements/autodetect.c index 0eb798b1e..b4ab60e95 100644 --- a/tests/check/elements/autodetect.c +++ b/tests/check/elements/autodetect.c @@ -30,23 +30,10 @@ GST_START_TEST (test_autovideosink_ghostpad_error_case) GstElement *pipeline, *src, *filter, *sink; GstCaps *caps; - /* check that there's a usable video sink (think of build bot case) */ - sink = gst_element_factory_make ("autovideosink", NULL); - state_ret = gst_element_set_state (sink, GST_STATE_READY); - - /* need to set state back to NULL, or our test won't work since we - * already have detected the real caps in ready and then linking fails */ - gst_element_set_state (sink, GST_STATE_NULL); - - if (state_ret != GST_STATE_CHANGE_SUCCESS) { - GST_WARNING ("No usable video sink, skipping test"); - gst_object_unref (sink); - return; - } - pipeline = gst_pipeline_new ("pipeline"); src = gst_element_factory_make ("fakesrc", NULL); filter = gst_element_factory_make ("capsfilter", NULL); + sink = gst_element_factory_make ("autovideosink", NULL); caps = gst_caps_new_simple ("video/x-raw-yuv", "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC ('A', 'C', 'D', 'C'), NULL); @@ -86,23 +73,10 @@ GST_START_TEST (test_autoaudiosink_ghostpad_error_case) GstElement *pipeline, *src, *filter, *sink; GstCaps *caps; - /* check that there's a usable audio sink (think of build bot case) */ - sink = gst_element_factory_make ("autoaudiosink", NULL); - state_ret = gst_element_set_state (sink, GST_STATE_READY); - - /* need to set state back to NULL, or our test won't work since we - * already have detected the real caps in ready and then linking fails */ - gst_element_set_state (sink, GST_STATE_NULL); - - if (state_ret != GST_STATE_CHANGE_SUCCESS) { - GST_WARNING ("No usable audio sink, skipping test"); - gst_object_unref (sink); - return; - } - pipeline = gst_pipeline_new ("pipeline"); src = gst_element_factory_make ("fakesrc", NULL); filter = gst_element_factory_make ("capsfilter", NULL); + sink = gst_element_factory_make ("autoaudiosink", NULL); caps = gst_caps_new_simple ("audio/x-raw-int", "width", G_TYPE_INT, 42, NULL); |