diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-01-16 12:30:11 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-01-16 12:30:11 +0000 |
| commit | 9b5868d7f3a7fbc7b38f44f9cff9026b6df86754 (patch) | |
| tree | c279894b9450d411d974ed716a97aabd166fa4d5 | |
| parent | 41b3cd9535ad6255c922974572a5930fc7250a41 (diff) | |
tests, docs: 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.
| -rw-r--r-- | docs/libs/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index cf116ed..d970d92 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -76,7 +76,7 @@ DOC_OVERRIDES = # override registry location for unusual gnonlin setup with plugins in docs/libs GNL_INSPECT_REGISTRY=$(top_builddir)/docs/libs/inspect-registry.dat -INSPECT_EXTRA_ENVIRONMENT=GST_REGISTRY=$(GNL_INSPECT_REGISTRY) +INSPECT_EXTRA_ENVIRONMENT=GST_REGISTRY_1_0=$(GNL_INSPECT_REGISTRY) include $(top_srcdir)/common/gtk-doc-plugins.mak diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 3216633..4524bf8 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -3,14 +3,14 @@ include $(top_srcdir)/common/check.mak CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.xml REGISTRY_ENVIRONMENT = \ - GST_REGISTRY=$(CHECK_REGISTRY) + GST_REGISTRY_1_0=$(CHECK_REGISTRY) # Note: GST_PLUGINS_GOOD_DIR is only set in an uninstalled setup TESTS_ENVIRONMENT = \ CK_DEFAULT_TIMEOUT=120 \ $(REGISTRY_ENVIRONMENT) \ - GST_PLUGIN_SYSTEM_PATH= \ - GST_PLUGIN_PATH=$(top_builddir)/gnl:$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) + GST_PLUGIN_SYSTEM_PATH_1_0= \ + GST_PLUGIN_PATH_1_0=$(top_builddir)/gnl:$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) # ths core dumps of some machines have PIDs appended CLEANFILES = core.* test-registry.xml |