summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThiago Santos <thiagoss@osg.samsung.com>2016-02-05 20:02:22 -0300
committerThiago Santos <thiagoss@osg.samsung.com>2016-02-05 20:02:22 -0300
commit669b360ff7ab03963105564e8b011b322b2ac175 (patch)
tree6e3c36e02b91632524fbf56105df6b6bade5b42a /tests
parent476768e538a0f389e45d85bd388d85041a3430ef (diff)
downloadgstreamer-plugins-bad-669b360ff7ab03963105564e8b011b322b2ac175.tar.gz
tests: extend the AM_TESTS_ENVIRONMENT from check.mak
To get the CK_DEFAULT_TIMEOUT defined for all tests https://bugzilla.gnome.org/show_bug.cgi?id=761472
Diffstat (limited to 'tests')
-rw-r--r--tests/check/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 49dd52e62..08be42829 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -9,7 +9,7 @@ REGISTRY_ENVIRONMENT = \
GST_REGISTRY_1_0=$(CHECK_REGISTRY)
# GST_PLUGINS_XYZ_DIR is only set in an uninstalled setup
-AM_TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT += \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SYSTEM_PATH_1_0= \
GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_LIBAV_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) \