mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 13:25:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

applying http://bugzilla.gnome.org/show_bug.cgi?id=110707 patch, should fix testsuite issues

Browse source 
Original commit message from CVS:
applying
http://bugzilla.gnome.org/show_bug.cgi?id=110707
patch, should fix testsuite issues
This commit is contained in:
Thomas Vander Stichele 2003-05-18 22:59:51 +00:00
parent 6b42d9aca7
commit 6cf83f6d8b
19 changed files with 75 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/gst.c
View file

@ -373,8 +373,15 @@ init_pre (void)
gst_registry_add_path (_global_registry, PLUGINS_DIR); gst_registry_add_path (_global_registry, PLUGINS_DIR);
#endif /* PLUGINS_USE_BUILDDIR */ #endif /* PLUGINS_USE_BUILDDIR */
homedir = g_get_home_dir (); if (g_getenv ("GST_REGISTRY"))
user_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL); {
user_reg = g_strdup (g_getenv ("GST_REGISTRY"));
}
else
{
homedir = g_get_home_dir ();
user_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL);
}
_user_registry = gst_xml_registry_new ("user_registry", user_reg); _user_registry = gst_xml_registry_new ("user_registry", user_reg);
g_free (user_reg); g_free (user_reg);

11
tests/old/testsuite/Makefile.am
View file

@ -7,8 +7,8 @@ endif
# FIXME : threads bytestream # FIXME : threads bytestream
SUBDIRS = caps plugin elements clock refcounting threads indexers $(GST_PARSE_DIRS) ## cleanup dynparams SUBDIRS = caps plugin elements clock refcounting threads indexers $(GST_PARSE_DIRS) ## cleanup dynparams
GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
testprogs = test_gst_init testprogs = test_gst_init
@ -18,7 +18,10 @@ testprogs =
inspectcheck = inspectcheck =
endif endif
TESTS = $(top_builddir)/tools/gst-register $(testprogs) $(inspectcheck) # since these TESTS are only run after recursing into subdirs,
# gst-register should be run before that, in the first subdir that uses it
# TESTS = $(top_builddir)/tools/gst-register $(testprogs) $(inspectcheck)
TESTS = $(testprogs) $(inspectcheck)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)
@ -27,7 +30,7 @@ LIBS = $(GST_LIBS)
AM_CFLAGS = $(GST_CFLAGS) AM_CFLAGS = $(GST_CFLAGS)
# we makes them, we gots to clean them # we makes them, we gots to clean them
CLEANFILES = test-registry.xml elementstest-registry.xml CLEANFILES = test-registry.xml
DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements indexers \ DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements indexers \
plugin refcounting threads parse plugin refcounting threads parse

9
tests/old/testsuite/caps/Makefile.am
View file

@ -1,9 +1,12 @@
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = intersection compatibility normalisation string-conversions testprogs = intersection compatibility normalisation string-conversions
TESTS = $(testprogs) # we run gst-register here, which is a HACK to generate the test registry
# before we actually run the real tests
# a better fix is welcome :)
TESTS = $(top_builddir)/tools/gst-register $(testprogs)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)

6
tests/old/testsuite/cleanup/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
FAILING = cleanup3 cleanup4 FAILING = cleanup3 cleanup4
else else
@ -6,9 +9,6 @@ endif
testprogs = cleanup1 cleanup2 $(FAILING) cleanup5 testprogs = cleanup1 cleanup2 $(FAILING) cleanup5
GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml
TESTS = $(testprogs) TESTS = $(testprogs)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)

4
tests/old/testsuite/clock/Makefile.am
View file

@ -1,5 +1,5 @@
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = clock1 clock2 testprogs = clock1 clock2

7
tests/old/testsuite/elements/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
tests_failing = fake tests_failing = fake
else else
@ -5,10 +8,6 @@ tests_failing =
endif endif
tests_working = name tee property tests_working = name tee property
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`test-registry.xml
TESTS = $(tests_working) TESTS = $(tests_working)
check_PROGRAMS = $(tests_failing) $(tests_working) check_PROGRAMS = $(tests_failing) $(tests_working)

3
tests/old/testsuite/indexers/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = cache1 indexdump testprogs = cache1 indexdump
TESTS = $(testprogs) TESTS = $(testprogs)

6
tests/old/testsuite/plugin/Makefile.am
View file

@ -1,7 +1,7 @@
plugindir = $(shell cd $(top_builddir)/testsuite/plugin/ && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd) plugindir = $(shell cd $(top_builddir)/testsuite/plugin/ && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml
plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la

6
tests/old/testsuite/refcounting/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
tests_failing = element bin element_pad pad tests_failing = element bin element_pad pad
else else
@ -11,9 +14,6 @@ pad_SOURCES = pad.c mem.c
element_pad_SOURCES = element_pad.c mem.c element_pad_SOURCES = element_pad.c mem.c
bin_SOURCES = bin.c mem.c bin_SOURCES = bin.c mem.c
GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml
TESTS = $(tests_working) TESTS = $(tests_working)
check_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS)

7
tests/old/testsuite/threads/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = thread1 thread2 thread3 thread5 threadb testprogs = thread1 thread2 thread3 thread5 threadb
testsfailing = threadc threadd threade threadf thread4 testsfailing = threadc threadd threade threadf thread4
@ -7,10 +10,6 @@ check_PROGRAMS = $(testprogs)
noinst_PROGRAMS = $(testsfailing) noinst_PROGRAMS = $(testsfailing)
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`test-registry.xml
LDADD = $(GST_LIBS) LDADD = $(GST_LIBS)
AM_CFLAGS = $(GST_CFLAGS) AM_CFLAGS = $(GST_CFLAGS)

11
testsuite/Makefile.am
View file

@ -7,8 +7,8 @@ endif
# FIXME : threads bytestream # FIXME : threads bytestream
SUBDIRS = caps plugin elements clock refcounting threads indexers $(GST_PARSE_DIRS) ## cleanup dynparams SUBDIRS = caps plugin elements clock refcounting threads indexers $(GST_PARSE_DIRS) ## cleanup dynparams
GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
testprogs = test_gst_init testprogs = test_gst_init
@ -18,7 +18,10 @@ testprogs =
inspectcheck = inspectcheck =
endif endif
TESTS = $(top_builddir)/tools/gst-register $(testprogs) $(inspectcheck) # since these TESTS are only run after recursing into subdirs,
# gst-register should be run before that, in the first subdir that uses it
# TESTS = $(top_builddir)/tools/gst-register $(testprogs) $(inspectcheck)
TESTS = $(testprogs) $(inspectcheck)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)
@ -27,7 +30,7 @@ LIBS = $(GST_LIBS)
AM_CFLAGS = $(GST_CFLAGS) AM_CFLAGS = $(GST_CFLAGS)
# we makes them, we gots to clean them # we makes them, we gots to clean them
CLEANFILES = test-registry.xml elementstest-registry.xml CLEANFILES = test-registry.xml
DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements indexers \ DIST_SUBDIRS = bytestream caps cleanup clock dynparams elements indexers \
plugin refcounting threads parse plugin refcounting threads parse

9
testsuite/caps/Makefile.am
View file

@ -1,9 +1,12 @@
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = intersection compatibility normalisation string-conversions testprogs = intersection compatibility normalisation string-conversions
TESTS = $(testprogs) # we run gst-register here, which is a HACK to generate the test registry
# before we actually run the real tests
# a better fix is welcome :)
TESTS = $(top_builddir)/tools/gst-register $(testprogs)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)

6
testsuite/cleanup/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
FAILING = cleanup3 cleanup4 FAILING = cleanup3 cleanup4
else else
@ -6,9 +9,6 @@ endif
testprogs = cleanup1 cleanup2 $(FAILING) cleanup5 testprogs = cleanup1 cleanup2 $(FAILING) cleanup5
GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml
TESTS = $(testprogs) TESTS = $(testprogs)
check_PROGRAMS = $(testprogs) check_PROGRAMS = $(testprogs)

4
testsuite/clock/Makefile.am
View file

@ -1,5 +1,5 @@
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = clock1 clock2 testprogs = clock1 clock2

7
testsuite/elements/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
tests_failing = fake tests_failing = fake
else else
@ -5,10 +8,6 @@ tests_failing =
endif endif
tests_working = name tee property tests_working = name tee property
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`test-registry.xml
TESTS = $(tests_working) TESTS = $(tests_working)
check_PROGRAMS = $(tests_failing) $(tests_working) check_PROGRAMS = $(tests_failing) $(tests_working)

3
testsuite/indexers/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = cache1 indexdump testprogs = cache1 indexdump
TESTS = $(testprogs) TESTS = $(testprogs)

6
testsuite/plugin/Makefile.am
View file

@ -1,7 +1,7 @@
plugindir = $(shell cd $(top_builddir)/testsuite/plugin/ && pwd) TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd) plugindir = $(shell cd $(top_builddir)/testsuite/plugin/ && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml
plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la

6
testsuite/refcounting/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
if BUILD_FAILING_TESTS if BUILD_FAILING_TESTS
tests_failing = element bin element_pad pad tests_failing = element bin element_pad pad
else else
@ -11,9 +14,6 @@ pad_SOURCES = pad.c mem.c
element_pad_SOURCES = element_pad.c mem.c element_pad_SOURCES = element_pad.c mem.c
bin_SOURCES = bin.c mem.c bin_SOURCES = bin.c mem.c
GST_PLUGIN_PATH = $(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`/test-registry.xml
TESTS = $(tests_working) TESTS = $(tests_working)
check_PROGRAMS = $(TESTS) check_PROGRAMS = $(TESTS)

7
testsuite/threads/Makefile.am
View file

@ -1,3 +1,6 @@
TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml
testprogs = thread1 thread2 thread3 thread5 threadb testprogs = thread1 thread2 thread3 thread5 threadb
testsfailing = threadc threadd threade threadf thread4 testsfailing = threadc threadd threade threadf thread4
@ -7,10 +10,6 @@ check_PROGRAMS = $(testprogs)
noinst_PROGRAMS = $(testsfailing) noinst_PROGRAMS = $(testsfailing)
GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=`pwd`test-registry.xml
LDADD = $(GST_LIBS) LDADD = $(GST_LIBS)
AM_CFLAGS = $(GST_CFLAGS) AM_CFLAGS = $(GST_CFLAGS)