summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Santos <thiagoss@osg.samsung.com>2016-02-05 19:11:38 -0300
committerThiago Santos <thiagoss@osg.samsung.com>2016-02-05 19:11:38 -0300
commit7e2f2f9e5b0b0da16fad50f23d184a273d025386 (patch)
tree29639f7322cdb9bfb161634ea7db8d38ff64f6a7
parent4f8cfea13813654e664891217fb9bfbca5e9e3af (diff)
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 c7ca6c1f..552558bd 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -5,7 +5,7 @@ CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.reg
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) \