summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiagoss@osg.samsung.com>2016-02-05 20:00:57 -0300
committerThiago Santos <thiagoss@osg.samsung.com>2016-02-05 20:00:57 -0300
commit522de42381cd6c68417b41e41610c78e4f71e1e6 (patch)
tree80b5d4a677c3053ddcc2317c9e647d43c26f566c
parent6cef3caf55732d62f1f0b4bedacc83193a1e84c0 (diff)
downloadgstreamer-plugins-good-522de42381cd6c68417b41e41610c78e4f71e1e6.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
-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 5184e24aa..2da3aaf8b 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -6,7 +6,7 @@ TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
REGISTRY_ENVIRONMENT = \
GST_REGISTRY_1_0=$(CHECK_REGISTRY)
-AM_TESTS_ENVIRONMENT = \
+AM_TESTS_ENVIRONMENT += \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SYSTEM_PATH_1_0= \
GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \