diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-01-16 12:09:39 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-01-16 12:09:39 +0000 |
| commit | 7d1798e49fc8ee9edd6a39c3331a71a0b2deabce (patch) | |
| tree | 3d2672709eacc9f1a71023740a3f17bfe198e906 /tests | |
| parent | 9976ffe93d9019d2d1b5fb9b88da215146bb8feb (diff) | |
| download | gst-libav-7d1798e49fc8ee9edd6a39c3331a71a0b2deabce.tar.gz | |
tests: use GST_*_1_0 environment variables everywhere
The _1_0 suffixed environment variables override the
non-suffixed ones, so if we're in an environment that
sets the _1_0 suffixed ones, such as jhbuild, we need
to set those to make sure ours actually always get
used.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 67fb318..41e7d4a 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -4,12 +4,12 @@ CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.xml TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files REGISTRY_ENVIRONMENT = \ - GST_REGISTRY=$(CHECK_REGISTRY) + GST_REGISTRY_1_0=$(CHECK_REGISTRY) TESTS_ENVIRONMENT = \ $(REGISTRY_ENVIRONMENT) \ - GST_PLUGIN_SYSTEM_PATH= \ - GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/../gst-plugins-good/gst:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) + GST_PLUGIN_SYSTEM_PATH_1_0= \ + GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/../gst-plugins-good/gst:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) # ths core dumps of some machines have PIDs appended CLEANFILES = core.* test-registry.xml |