diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-02-09 00:15:25 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-02-09 00:15:25 +0000 |
| commit | 6afa17d8f0d32f621ed9c908a694620d00129012 (patch) | |
| tree | 4488a88ffc3971f488eb203ca8f6e1c35072aa6c /tests | |
| parent | d90422ec8a8e6e061621630646e6f86877dadbf9 (diff) | |
gst/: Fix includes order
Original commit message from CVS:
* gst/equalizer/Makefile.am:
* gst/spectrum/Makefile.am:
Fix includes order
* tests/check/Makefile.am:
Exclude v4l2src from the states test - it takes too long to start.
* tests/check/elements/spectrum.c:
Make the test run properly with CK_FORK=no
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check/elements/spectrum.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index ea2fcaa5..77e20a8d 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -11,7 +11,7 @@ TESTS_ENVIRONMENT = \ GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \ GST_TEST_FILES_PATH=$(TEST_FILES_DIRECTORY) \ - STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfvideosrc" + STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfvideosrc v4l2src" # ths core dumps of some machines have PIDs appended CLEANFILES = core.* test-registry.* diff --git a/tests/check/elements/spectrum.c b/tests/check/elements/spectrum.c index 245b37bc..98e0074d 100644 --- a/tests/check/elements/spectrum.c +++ b/tests/check/elements/spectrum.c @@ -124,6 +124,10 @@ cleanup_spectrum (GstElement * spectrum) gst_check_teardown_src_pad (spectrum); gst_check_teardown_sink_pad (spectrum); gst_check_teardown_element (spectrum); + + g_list_foreach (buffers, (GFunc) gst_mini_object_unref, NULL); + g_list_free (buffers); + buffers = NULL; } @@ -222,7 +226,6 @@ GST_START_TEST (test_int16) gst_element_set_bus (spectrum, NULL); ASSERT_OBJECT_REFCOUNT (bus, "bus", 1); gst_object_unref (bus); - gst_buffer_unref (outbuffer); fail_unless (gst_element_set_state (spectrum, GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null"); ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1); @@ -324,7 +327,6 @@ GST_START_TEST (test_int32) gst_element_set_bus (spectrum, NULL); ASSERT_OBJECT_REFCOUNT (bus, "bus", 1); gst_object_unref (bus); - gst_buffer_unref (outbuffer); fail_unless (gst_element_set_state (spectrum, GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null"); ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1); @@ -426,7 +428,6 @@ GST_START_TEST (test_float32) gst_element_set_bus (spectrum, NULL); ASSERT_OBJECT_REFCOUNT (bus, "bus", 1); gst_object_unref (bus); - gst_buffer_unref (outbuffer); fail_unless (gst_element_set_state (spectrum, GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null"); ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1); @@ -528,7 +529,6 @@ GST_START_TEST (test_float64) gst_element_set_bus (spectrum, NULL); ASSERT_OBJECT_REFCOUNT (bus, "bus", 1); gst_object_unref (bus); - gst_buffer_unref (outbuffer); fail_unless (gst_element_set_state (spectrum, GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null"); ASSERT_OBJECT_REFCOUNT (spectrum, "spectrum", 1); |