From 681b2b8d81d9584ff8f45f48916a8601afd46580 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiagoss@osg.samsung.com>
Date: Fri, 5 Feb 2016 19:15:16 -0300
Subject: [PATCH] tests: extend the AM_TESTS_ENVIRONMENT from check.mak

To get the CK_DEFAULT_TIMEOUT defined for all tests.

Also replaces a 120 timeout that was set.

https://bugzilla.gnome.org/show_bug.cgi?id=761472
---
 tests/check/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 1a51fc6667..fd96c15565 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -6,8 +6,7 @@ TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
 REGISTRY_ENVIRONMENT = \
 	GST_REGISTRY_1_0=$(CHECK_REGISTRY)
 
-AM_TESTS_ENVIRONMENT = \
-	CK_DEFAULT_TIMEOUT=120                                  \
+AM_TESTS_ENVIRONMENT += \
 	GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"	\
 	$(REGISTRY_ENVIRONMENT)					\
 	GST_PLUGIN_SYSTEM_PATH_1_0=				\