make sure registry is built properly
Original commit message from CVS: make sure registry is built properly
This commit is contained in:
parent
2789040516
commit
6271b0c200
@ -1,10 +1,15 @@
|
||||
include $(top_srcdir)/common/check.mak
|
||||
|
||||
CHECK_REGISTRY=$(top_builddir)/check/test-registry.xml
|
||||
CHECK_REGISTRY = $(top_builddir)/check/test-registry.xml
|
||||
|
||||
TESTS_ENVIRONMENT=\
|
||||
REGISTRY_ENVIRONMENT = \
|
||||
GST_REGISTRY=$(CHECK_REGISTRY)
|
||||
|
||||
TESTS_ENVIRONMENT = \
|
||||
$(REGISTRY_ENVIRONMENT) \
|
||||
GST_PLUGIN_PATH_ONLY=yes \
|
||||
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext
|
||||
|
||||
# ths core dumps of some machines have PIDs appended
|
||||
CLEANFILES = core.* test-registry.xml
|
||||
|
||||
@ -12,8 +17,6 @@ clean-local: clean-local-check
|
||||
|
||||
$(CHECK_REGISTRY):
|
||||
$(TESTS_ENVIRONMENT) \
|
||||
GST_PLUGIN_PATH_ONLY=yes \
|
||||
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext \
|
||||
$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
|
||||
|
||||
TESTS = $(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@ \
|
||||
|
@ -69,7 +69,6 @@ GstElement *
|
||||
setup_vorbisdec ()
|
||||
{
|
||||
GstElement *vorbisdec;
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
GST_DEBUG ("setup_vorbisdec");
|
||||
vorbisdec = gst_check_setup_element ("vorbisdec");
|
||||
@ -82,8 +81,6 @@ setup_vorbisdec ()
|
||||
void
|
||||
cleanup_vorbisdec (GstElement * vorbisdec)
|
||||
{
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
GST_DEBUG ("cleanup_vorbisdec");
|
||||
|
||||
gst_check_teardown_src_pad (vorbisdec);
|
||||
|
2
common
2
common
@ -1 +1 @@
|
||||
Subproject commit 2827052513b1aa41f4a2414c163cfd0f4790b43c
|
||||
Subproject commit aa2a757c587d91069a230d8e656481c3c364ccc6
|
@ -1,10 +1,15 @@
|
||||
include $(top_srcdir)/common/check.mak
|
||||
|
||||
CHECK_REGISTRY=$(top_builddir)/check/test-registry.xml
|
||||
CHECK_REGISTRY = $(top_builddir)/check/test-registry.xml
|
||||
|
||||
TESTS_ENVIRONMENT=\
|
||||
REGISTRY_ENVIRONMENT = \
|
||||
GST_REGISTRY=$(CHECK_REGISTRY)
|
||||
|
||||
TESTS_ENVIRONMENT = \
|
||||
$(REGISTRY_ENVIRONMENT) \
|
||||
GST_PLUGIN_PATH_ONLY=yes \
|
||||
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext
|
||||
|
||||
# ths core dumps of some machines have PIDs appended
|
||||
CLEANFILES = core.* test-registry.xml
|
||||
|
||||
@ -12,8 +17,6 @@ clean-local: clean-local-check
|
||||
|
||||
$(CHECK_REGISTRY):
|
||||
$(TESTS_ENVIRONMENT) \
|
||||
GST_PLUGIN_PATH_ONLY=yes \
|
||||
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext \
|
||||
$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
|
||||
|
||||
TESTS = $(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@ \
|
||||
|
@ -69,7 +69,6 @@ GstElement *
|
||||
setup_vorbisdec ()
|
||||
{
|
||||
GstElement *vorbisdec;
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
GST_DEBUG ("setup_vorbisdec");
|
||||
vorbisdec = gst_check_setup_element ("vorbisdec");
|
||||
@ -82,8 +81,6 @@ setup_vorbisdec ()
|
||||
void
|
||||
cleanup_vorbisdec (GstElement * vorbisdec)
|
||||
{
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
GST_DEBUG ("cleanup_vorbisdec");
|
||||
|
||||
gst_check_teardown_src_pad (vorbisdec);
|
||||
|
Loading…
x
Reference in New Issue
Block a user