tests/check/Makefile.am: Fix up some CFLAGS sets.
Original commit message from CVS: * tests/check/Makefile.am: Fix up some CFLAGS sets. Don't include gconfvideosrc in the states test. * tests/check/elements/autodetect.c: (GST_START_TEST): Add some error strings to fail_unless arguments to fix some weird compiler errors on Solaris.
This commit is contained in:
parent
a973a4f154
commit
23b5b27e1c
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
|||||||
|
2008-01-21 Jan Schmidt <Jan.Schmidt@sun.com>
|
||||||
|
|
||||||
|
* tests/check/Makefile.am:
|
||||||
|
Fix up some CFLAGS sets.
|
||||||
|
Don't include gconfvideosrc in the states test.
|
||||||
|
|
||||||
|
* tests/check/elements/autodetect.c: (GST_START_TEST):
|
||||||
|
Add some error strings to fail_unless arguments to fix some weird
|
||||||
|
compiler errors on Solaris.
|
||||||
|
|
||||||
2008-01-21 Jan Schmidt <Jan.Schmidt@sun.com>
|
2008-01-21 Jan Schmidt <Jan.Schmidt@sun.com>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
@ -11,7 +11,7 @@ TESTS_ENVIRONMENT = \
|
|||||||
GST_PLUGIN_SYSTEM_PATH= \
|
GST_PLUGIN_SYSTEM_PATH= \
|
||||||
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \
|
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) \
|
GST_TEST_FILES_PATH=$(TEST_FILES_DIRECTORY) \
|
||||||
STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay"
|
STATE_IGNORE_ELEMENTS="aasink autovideosink cacasink cairotextoverlay gconfvideosrc"
|
||||||
|
|
||||||
# ths core dumps of some machines have PIDs appended
|
# ths core dumps of some machines have PIDs appended
|
||||||
CLEANFILES = core.* test-registry.*
|
CLEANFILES = core.* test-registry.*
|
||||||
@ -100,18 +100,18 @@ elements_audiopanorama_CFLAGS = \
|
|||||||
$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) \
|
$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) \
|
||||||
$(CFLAGS) $(AM_CFLAGS)
|
$(CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS)
|
elements_cmmldec_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
|
||||||
elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS)
|
elements_cmmlenc_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
elements_alphacolor_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS)
|
elements_alphacolor_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
elements_sunaudio_CFLAGS = \
|
elements_sunaudio_CFLAGS = \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_PLUGINS_BASE_CFLAGS) $(CFLAGS) \
|
||||||
$(AM_CFLAGS)
|
$(AM_CFLAGS)
|
||||||
elements_sunaudio_LDADD = \
|
elements_sunaudio_LDADD = \
|
||||||
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \
|
$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \
|
||||||
$(LDADD)
|
$(LDADD)
|
||||||
|
|
||||||
elements_videocrop_LDADD = $(LDADD) $(GST_BASE_LIBS)
|
elements_videocrop_LDADD = $(LDADD) $(GST_BASE_LIBS)
|
||||||
elements_videocrop_CFLAGS = $(CFLAGS) $(AM_CFLAGS) $(GST_BASE_CFLAGS)
|
elements_videocrop_CFLAGS = $(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
|
@ -56,8 +56,9 @@ GST_START_TEST (test_autovideosink_ghostpad_error_case)
|
|||||||
|
|
||||||
gst_bin_add_many (GST_BIN (pipeline), src, filter, sink, NULL);
|
gst_bin_add_many (GST_BIN (pipeline), src, filter, sink, NULL);
|
||||||
|
|
||||||
fail_unless (gst_element_link (src, filter));
|
fail_unless (gst_element_link (src, filter), "Failed to link src to filter");
|
||||||
fail_unless (gst_element_link (filter, sink));
|
fail_unless (gst_element_link (filter, sink),
|
||||||
|
"Failed to link filter to sink");
|
||||||
|
|
||||||
/* this should fail, there's no such format */
|
/* this should fail, there's no such format */
|
||||||
state_ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
|
state_ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
|
||||||
@ -68,7 +69,8 @@ GST_START_TEST (test_autovideosink_ghostpad_error_case)
|
|||||||
* deadlock or block anywhere when autovideosink resets the ghostpad
|
* deadlock or block anywhere when autovideosink resets the ghostpad
|
||||||
* targets etc. */
|
* targets etc. */
|
||||||
state_ret = gst_element_set_state (pipeline, GST_STATE_NULL);
|
state_ret = gst_element_set_state (pipeline, GST_STATE_NULL);
|
||||||
fail_unless (state_ret == GST_STATE_CHANGE_SUCCESS);
|
fail_unless (state_ret == GST_STATE_CHANGE_SUCCESS,
|
||||||
|
"State change on pipeline failed");
|
||||||
|
|
||||||
/* clean up */
|
/* clean up */
|
||||||
gst_object_unref (pipeline);
|
gst_object_unref (pipeline);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user