diff options
| author | Thiago Santos <thiagoss@osg.samsung.com> | 2016-02-05 20:03:01 -0300 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2016-02-05 20:03:01 -0300 |
| commit | 332846173848205a2c0ea72e40f060477dade8d2 (patch) | |
| tree | 9e1f12f395cdbfaeffbbb792c80406fe2c97f989 | |
| parent | f621e40efef5835b33d8bcc6a4fd93737123a04b (diff) | |
tests: extend the AM_TESTS_ENVIRONMENT from check.mak
To get the CK_DEFAULT_TIMEOUT defined for all tests
Also removes a 120 seconds timeout that was set as default
explicitly in this module
https://bugzilla.gnome.org/show_bug.cgi?id=761472
| -rw-r--r-- | tests/check/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index f3b5c82..8871519 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= \ |